Using Git Efficiently

Bycoliveira

I started using Git a few years ago, and to be sure, I cannot say that I know everything about it. However, I know enough of it to say that I am much more efficient using Git than other source control method.

In this post, I will summarize some of the commands everyone need to know in order to start using Git.

Creating a Repository

Creating a repository is just a matter of initialize a directory with git metadata, and add the files to the repository. For example, suppose you want to create a repository of directory /home/john/myproject To do this, you need to use the commands

cd /home/john/myproject
git init
git add .
git commit -m 'first version'

The first git command just initializes the .git directory, where all git metadata is stored. The second command adds everything under the current directory to the repository. Finally, the git commit command creates the initial revision of the project into the repository.

Making Changes

The next common operation in a repository is to make changes to the existing files. After you make the needed changes using your text editor or IDE, the following commands will do the trick:

git add ChangedFile1 ChangedFile2
git commit -m 'description of change'

The git add is necessary even if the file exists, because without it git doesn’t know if the files needs to be updated or not. In git parlance, git add is used to create the “staging area”, which will be written by the commit.

This is a difference from SVN, for example, where anytime we do a commit the system accepts all changes by default. With git you need to be specific about what is being commited.

Optionally, if you prefer to use a GUI to view the changes, you can use the command

git gui

This will invoke the Tk interface, which works both on UNIX and windows (and probably Mac OS X).

Deleting and Recovering

Another common operation is to remove files. This can be done with

git rm FileName

notice that this will work if the files hasn’t been modified. If you need to delete a file that has been changed, use

git rm -f FileName

To recover a file that has been deleted or changed, you can use the following

git checkout -- FileName

Creating Branches

With the commands above you can do pretty much anything you need in terms of normal usage of a VCS. However, creating branches is where the fun is. Git favors the creation of branches, because creating them is very fast and cheap (as measured in memory usage).

To create and use a new branch, type

git branch BranchName
git checkout BranchName

The first command creates the branch, while the second changes to the new branch. You can always go back using

git checkout master

where master is the default branch name.

Merging Files

Git makes it very easy to create branches, but also to merge the results of two or more branches. To merge a branch called “BranchName”, you can use the command

git merge BranchName

Git does a great work of solving conflicts automatically. However, if it can’t solve the conflict, you will be able to edit the files manually and commit them as normal.

You can visualise the results of merges and of other branches using a graphical tool. Just type

gitk --all

and you will be able to see all branches in the repository, along with the history. For a short log of changes, you can also type

git log

Advanced Tricks

There are thousands of advanced tricks you can learn with git, since each part of the system may work independently of the others. I will give you just a flavor of what you can do.

For example, if you want to change the order in which commit appear in a branch, you can use

git rebase -i CommitID

The commit id is the hexadecimal number listed on each commit when you use git log. The command above will call an editor and allow you to edit the commits that have been made since CommitID. You can change the order in which they are applied, merge two or more commits, or even remove some of them. In this way, you can rewrite the history of your commits, and make changes that you wouldn’t be able to do in something as SVN.

Similar Posts:

Similar Posts

The Most Common Debugging Styles

Bycoliveira

Debugging code is an activity that shows a lot of the developer’s personality. It is a process that looks a lot like an investigation, leading to the detection of a failure in an application. During the investigation, a programmer has to employ some techniques, like information gathering, testing of hypothesis, performing quick instrumentation, etc. When…

Day 18: Development Speed is Important

Bycoliveira

When people learn to develop software, they believe that long hours of concentration and isolation are the best, and maybe unique, way to achieve high quality code. Many think that by working slowly and carefully they may be able to catch most bugs and create a solid base for the program they are creating. This…

What to watch for in a Framework

Bycoliveira

Frameworks are created to make our lives simpler. They try to hide most of the complexity from an environment using layers of library code. In that way, users don’t need to worry about managing the lower level features of the environment. They should, instead, concentrate on the higher level functions (business logic) of their code….

14 Comments

  2. In Konkurrenz dazu wandelte die CBS-Konzernmutter Columbia Pictures
    1967 den Stoff zu einer Parodie mit David Niven als ein James Bond.
    Aus diesem Grunde standen die Rechte nicht mehr zur Verfügung, als Albert R.
    Broccoli und Harry Saltzman mit ihrer Produktionsfirma Eon Productions fast ein Jahrzehnt
    später die James-Bond-Filme zum Welterfolg führten. Das Lied
    entstand in enger Zusammenarbeit zwischen Arnold und Cornell inmitten der Arbeiten zu Cornells zweitem Soloalbum Carry On.
    James Bond hat seine Lizenz zum Töten erst kürzlich erhalten und ist ein genialer Kartenspieler, doch mit ihm geht der
    Geheimdienst auch ein Risiko ein, da er für seine Hitzeköpfigkeit
    bekannt ist. Der Plan von M16 ist es nämlich, ihn nach dem
    Turnier endgültig festzunehmen, damit er nicht mehr mit Touristen in Kontakt kommen kann.
    Dort sind die Millionen Dollar Einsätze so hoch
    wie an den No Limit Tischen im Bitcoin Casino, dass Le Chiffre mit Leichtigkeit das verzockte Geld zurück gewinnen könnte.
    Der französische Unternehmer Le Chiffre arbeitet offiziell an der Börse, aber in Wirklichkeit verwaltet er das Geld von internationalen Terroristen-Banden. Die Geheimdienstchefin M schickt
    Bond auf eine Mission, um einen französischen Unternehmer Namens „Le Chiffre“ kaltzumachen. Wie in den 3 Vorgängerfilmen war
    diesmal wieder David Arnold für die Filmmusik verantwortlich.

    Scheinbar unger?hrt entschwindet Bond mit dem Lift …

    James Bond Casino Royale ist heute auf Platz 474 in den täglichen JustWatch Streaming-Charts.
    Zwar verläuft nicht alles nach Plan, doch
    als Bond auf eigene Faust weiter ermittelt, kommt er auf
    die Spur von Le Chiffre, dem Bankier einer weltweit operierenden Terror-Organisation.

    References:
    https://online-spielhallen.de/mr-bet-casino-cashback-ihr-weg-zu-mehr-spielguthaben/

  3. Die Spielauswahl ist groß und es ist wirklich für jeden was dabei..
    Muss sagen das neue schlichte aber Moderne Design des Casinos gefällt mir
    sehr gut.Als Bonus habe ich deinen 100% Bonus erhalten und somit mit 40€ gestartet!
    Es stehen noch sehr viele gängige provider zur auswahl.
    Auch das spieleangebot kann sich durchaus noch sehen lassen. Positiv zu erwähnen ist das meine einzahlung mit skrill ohne probleme
    funktioniert hat. Etwa 24h ( auf E-Wallets) ich kann das casino jedem nur empfehlen,habe persönlich bisher nur gute erfahrungen dort gemacht.

    So werden beispielsweise nur Spiele eines bestimmten Typs oder von einem bestimmten Spieleanbieter angezeigt,
    oder nur jene Casinos, die eine von Ihnen bevorzugte
    Zahlungsmethode unterstützt, usw. Bis zum heutigen Tag haben wir bereits mehr als
    7.000 Echtgeld Casinos überprüft – also im Grunde genommen, jedes einzelne Casino im Internet, das wir finden konnten. Eine der wichtigsten Hauptaufgaben bei Casino Guru
    besteht darin, unseren Besuchern dabei zu helfen,
    die besten Online Casinos zu finden. Sie werden viele weiterführende Informationen erfahren, wenn Sie unseren Artikel über
    Glücksspielelesen.
    Der Willkommensbonus im Casumo Casino bietet neuen Spielern ein großzügiges Paket
    zum Einstieg. Zudem erwartet dich ein Willkommenspaket aus Bonusguthaben und Freispielen. Die Gewinne aus den Freispielen musst
    du innerhalb von sieben Tagen 40 Mal für
    die Auszahlung umsetzen. 100% Bonus bis zu 100€ und 50 Freispiele kannst du als neuer Spieler mit dem Casumo Bonus als Angebot erhalten. Du kannst
    als Spieler aus Deutschland legal im Casumo Casino spielen.

    References:
    https://online-spielhallen.de/ihre-ultimative-anleitung-zum-kingmaker-casino-bonus-code/

  4. Bremen ist eine weltbekannte Hansestadt – nicht nur
    wegen des berühmten Märchens der Gebrüder Grimm.
    Von der A27 einfach die Ausfahrt Bremen Überseestadt nehmen und auf der B6 ins Stadtzentrum fahren. Das Bellini oder LUV sind
    nur zwei Beispiele für Restaurants, die Euch leckere Menüs auf die Teller zaubern. Für die Zeit danach bietet die Bar auf jeden Fall den richtigen Mix.
    Im Mittelpunkt steht zwar immer das Spiel im Automatencasino und
    an den Tischen beim Großen Spiel. Wie in Online
    Poker Casinos finden auch in der Spielbank regelmäßig Turniere statt.

    Im Erdgeschoss befinden sich die klassischen Spiele mit Roulette-,
    Blackjack- und Pokertischen. Über 180 der neuesten Slots aus aller Welt befinden sich im ersten Stock des Gebäudes.

    Die Spielbank Bad Zwischenahn ist von Bremen aus über
    Oldenburg in etwa 40 Minuten zu erreichen und bietet ein weitaus umfassenderes Spielerlebnis als das Casino
    Bremen. Auch wenn Bremen und Bremerhaven eine eigene Spielbank besitzen, kann das relativ kleine Spielangebot gerade für regelmäßige Spieler
    etwas eintönig sein. Wenn du dich auf kleines
    Casinospiel, also das Zocken an Spielautomaten mit kleinen bis
    mittleren Einsätzen beschränkst, musst du nicht unbedingt eine
    der Spielbanken in Bremen oder in der Umgebung aufsuchen, um Spaß zu haben.
    Bei einem Aufenthalt in der schönen Hansestadt darf ein Besuch in der Spielbank Bremen nicht fehlen.
    Wir bieten dir bundesweit das besondere Spielerlebnis mit original Casino Spieltischen und professionellen Croupiers
    für alle Arten von Veranstaltungen an. Wir bieten dir in Bremen ein rundum durchdachtes Konzept, das für Abwechslung,
    Spannung und bleibende Eindrücke sorgt. Unsere
    hochwertige Ausstattung und das professionelle Personal sorgen für ein stimmungsvolles Ambiente und Unterhaltung auf höchstem Niveau – direkt bei
    dir vor Ort. Miete jetzt unser mobiles Casino in Bremen und hol dir echtes Spielbank-Feeling direkt zu
    deiner Veranstaltung.

    References:
    https://online-spielhallen.de/stake-casino-auszahlung-ihr-umfassender-leitfaden/

  5. Crypto adoption is rising, with 15% of Aussie players using
    Bitcoin in 2024, per industry reports. Top casinos partner with
    giants like NetEnt, Pragmatic Play, and Evolution Gaming.
    Fast payouts and mobile gaming are top priorities, driving sites like Jet4Bet Casino to optimise
    for speed and accessibility. They’re great for
    players who don’t trust crypto or prefer linking to
    their bank. They’re ideal for players who value privacy or want fast payouts without
    verification for smaller amounts. Joka Casino and Wolf Winner Casino have
    slick apps for iOS and Android, with full access to games and banking.

    Next up, depositing some AUD. Lots of pokies and pokies tournaments.
    First things first, you can sign up via Google here – bonus marks right off the bat.
    If I had to choose a casino that feels like the most complete
    overall product, I’d select King Billy.

    Then, there are all the different pokie themes you can choose from,
    like Candy and Ancient Egypt pokies.
    If I were choosing for myself, I’d pick any new online casino with a few hundred
    top-rated pokies and some poker, roulette, and blackjack tables, and that would be enough.
    Furthermore, a casino boasting thousands of games yet offering only
    a limited number of live poker tables is almost sacrilegious.
    Only slots contribute 100% of wagers toward bonus
    wagering, unlike other casinos, where these games typically contribute 2% to 15%.

    References:
    https://blackcoin.co/playamo-casino-safe-online-casino-in-australia/

  6. The company reports that it had RMB 21,000 (about $5,000 at the time)
    in registered capital from Ren Zhengfei and five
    other investors at the time of its founding, when each contributed RMB 3,500.

    In the 1980s, the Chinese Communist Party (CCP) and the
    Chinese government endeavored to overhaul the nation’s underdeveloped telecommunications infrastructure.
    In 2012, Australian and US intelligence agencies
    concluded that a hack on Australia’s telecom networks was conducted by or through
    Huawei, although the two network operators have disputed
    that information.
    On December 1, 2018, Meng Wanzhou, the board deputy chairperson and daughter of the founder of the Chinese multinational
    technology corporation Huawei, was detained upon arrival at Vancouver International Airport by Canada Border Services Agency (CBSA) officers for questioning, which lasted three hours.

    In November 2020, Huawei challenged the UK government’s decision, citing an Oxford Economics report that it had contributed £3.3 billion to the UK’s GDP.
    The Huawei Cyber Security Evaluation Centre (HCSEC), set up in 2010 to assuage security fears as it examined Huawei hardware and software for the UK market, was staffed largely by
    employees from Huawei but with regular oversight from GCHQ, which led to questions
    of operating independence from Huawei. The Chinese
    government has threatened economic retaliation against countries
    that block Huawei’s market access. Huawei has been at the center of concerns over Chinese involvement in 5G wireless networks.

    References:
    https://blackcoin.co/dunder-bonus-best-offer-for-2025/

  7. So, new casino operators must keep players engaged through the games they offer.
    We check for no deposit bonuses, regular deposit offers, and bonuses for high
    rollers. To successfully do that, we monitor casino platforms, including
    the latest online casinos, from every country and jurisdiction where online gambling
    is legal. While some new online casinos may have a higher
    payout percentage than an existing site, this
    is not a hard and fast rule.
    We are saying this from experience, and it most certainly does not feel good when such things happen and end up causing you major financial harm.
    If you do not, there is a chance you might end up breaking some crucial rules, which could lead
    to all of your money being confiscated. No one wants to just see hundreds of game icons on their site with no direction. Intuitive layout, short load times and visually
    appealing design always contribute to a positive user
    experience.
    In order to buy you some time, we recommend that you take a
    look at our team’s online casino reviews to find out the best US online casinos, or just take
    a look at the details we’ve added below. Again, not all sites fit
    this criterion, but if you’re in a state that has legalized online gambling then it’s much easier to find a decent online casino.
    PokerNews has reviewed and compared the top real money casino sites
    available across the United States, including New Jersey, Pennsylvania, Michigan,
    and West Virginia. Your new online casino site
    should never drag you down with demanding playthrough requirements.

    Take a look at our criteria for latest online casinos.
    But make sure you check in with Casinority, as a
    new online casino 2025 may very well change if something better comes
    up.

  8. The dark-themed interface looks great on mobile screens
    and helps players stay focused on the action. Our
    minimum deposit amount is just A$10, making it easy for players of all budgets to join the fun.
    Crash Games Offering a unique fast-paced betting format, platform provides crash games
    that are becoming increasingly popular due to their dynamic nature.

    Register today, claim your bonus, and level up
    your gaming experience — where every spin brings you closer to a win! It delivers push notifications, optimized performance, and instant access to the casino — perfect for gaming on the go.
    The platform uses SSL encryption to protect personal data and payments, providing a completely secure gaming environment.
    LevelUp Casino is a fully licensed online casino,
    operating under international gaming regulations to
    ensure fairness and transparency.

  9. No deposit casino credits let you experience a site without funding your account.
    Free spins or credits don’t just come as part of
    a no deposit welcome bonus. These might include at least five days to use
    them, wagering requirements of less than 35x, and a high limit
    on your maximum potential cashout. Often, you can cash out your winnings
    once you’ve cleared wagering requirements.
    Known as one of the most sought-after bonuses, no deposit bonuses make playing real money casino games fun. While no deposit bonus codes are typically granted to new players,
    existing users might be able to claim ongoing offers that don’t require a deposit.
    At some online casinos, deposits made at a casino cage or through PayNearMe are not eligible for bonus offers.
    A no deposit bonus casino welcome offer is a signup bonus that
    doesn’t require players to put money in their accounts.
    What’s more, no deposit bonuses offer players the potential to
    win real money without taking any financial risk. Instead, look
    for online casinos offering no deposit bonuses or free spins on their pokies.

    References:
    https://blackcoin.co/woospin-premier-pokies-paradise-for-aussie-players-in-2025/

  10. With an extensive selection of real money games, cutting-edge technology, and seamless payment solutions,
    this platform caters to players of all levels. King Johnnie
    Casino Australia stands as a top-tier platform
    for online casino enthusiasts and sports bettors seeking a secure, rewarding, and high-quality gaming experience.
    Explore the best online gaming experience today and discover why players across Australia choose King Johnnie Casino as their ultimate betting destination. With a vast selection of high-quality casino games, live dealer options, and competitive sports betting odds, we bring world-class entertainment straight to
    your fingertips. King Johnnie Casino has launched an official mobile app to make gaming more convenient for Australian players.
    A strong reputation and positive feedback from other players can provide valuable insights into
    the casino’s reliability and overall quality.By keeping these factors in mind,
    Australian players can confidently navigate the world of online gambling and
    choose a trustworthy platform like King Johnnie Casino, which ticks all the right boxes.

    Accessing your King Johnnie Casino account is
    quick and hassle-free. The mobile version automatically adjusts to any screen size, offering the
    same clean design, quick loading times, and full functionality you’d expect on desktop.
    Whether you’re using a smartphone or tablet, the site runs smoothly right from your browser with no
    app downloads required.

    References:
    https://blackcoin.co/play-your-way-only-at-ac8-casino/

Leave a Reply

Your email address will not be published. Required fields are marked *

This site uses Akismet to reduce spam. Learn how your comment data is processed.