Tips from the experts on getting more from Git
Tip 10: Automatic Analysis
Adam Spiers has no qualms about advertising his own product, git-deps
[15]. This tool is used to automatically analyze dependencies between commits in a Git repository. According to Spiers, git-deps
has plenty of uses, including:
- porting between branches
- splitting a patch series into independent parts
- supporting cooperation in development teams
- automatic integration of fix-up commits
The tool also helps you clean up the private commit history before publishing.
Tip 11: Fixups and Rebases
Alvaro Saurin stresses the importance of a correct understanding of git commit -fixup=Commit
, which marks the commit as a fixup of a previous commit, and its counterpart git rebase -autosquash
, which merges the original commit and the fixup into a new commit. For example, suppose a developer is at the following location:
Master -> Modification 2 -> Modification 1 -> Current modification
In the next step, the developer could then initiate a fixup commit for Change 2
. The command for this is git commit --fixup=HEAD~1
. The results would look like this:
Master -> Change 2 -> Change 1 -> Fixup-Commit-for-Change-2
A subsequent git rebase -i --autosquash
then automatically merges the fixup with change 2
(shown here in two steps):
Master -> Change 2 -> Fixup-for-change-2 -> Change 1 Master -> New change 2 -> Change 1
This sequence of steps could also be defined as a Git alias and executed in one step. Developer Bernhard Wiedemann shows how this works in Listing 5.
Listing 5
Autosquash Alias
And this – as Benjamin Zeller notes – could be activated as the default via the Git configuration.
The alias, on the other hand, is not necessary for people who use Adam Spier's git-fixup
[16]. The developer is convinced that the approach described is one of the most fundamental that a developer needs to understand in Git.
Unsurprisingly, the sequence can also be embedded in Emacs and called with just three keys. C opens the commit menu; F starts the instant fixup; you can then choose what you want to fix. A "." tells Emacs to create the fixup commit, automatically going through all unrecorded changes, interactive rebasing, and even leaving the stash at the end.
Tip 12: In Color and Colorful!
A tip that adds color to Git also comes courtesy of Bernhard Wiedemann. According to his own statement, he found the following, not really pretty alias "somewhere on the Internet":
lfi = log HEAD --graph --all --abbrev-commit --full-history --color -pretty=format:'%Cred%h%Creset -%C(yellow) %d%Creset%s%Cgreen(%cr) %C(bold blue)<%an>%Creset' --date=relative
He quickly got used to the clarity of a colored representation of the tree diagram in the history.
Buy this article as PDF
(incl. VAT)
Buy Linux Magazine
Subscribe to our Linux Newsletters
Find Linux and Open Source Jobs
Subscribe to our ADMIN Newsletters
Support Our Work
Linux Magazine content is made possible with support from readers like you. Please consider contributing when you’ve found an article to be beneficial.
News
-
Fedora 40 Beta Released Soon
With the official release of Fedora 40 coming in April, it's almost time to download the beta and see what's new.
-
New Pentesting Distribution to Compete with Kali Linux
SnoopGod is now available for your testing needs
-
Juno Computers Launches Another Linux Laptop
If you're looking for a powerhouse laptop that runs Ubuntu, the Juno Computers Neptune 17 v6 should be on your radar.
-
ZorinOS 17.1 Released, Includes Improved Windows App Support
If you need or desire to run Windows applications on Linux, there's one distribution intent on making that easier for you and its new release further improves that feature.
-
Linux Market Share Surpasses 4% for the First Time
Look out Windows and macOS, Linux is on the rise and has even topped ChromeOS to become the fourth most widely used OS around the globe.
-
KDE’s Plasma 6 Officially Available
KDE’s Plasma 6.0 "Megarelease" has happened, and it's brimming with new features, polish, and performance.
-
Latest Version of Tails Unleashed
Tails 6.0 is based on Debian 12 and includes GNOME 43.
-
KDE Announces New Slimbook V with Plenty of Power and KDE’s Plasma 6
If you're a fan of KDE Plasma, you'll be thrilled to hear they've announced a new Slimbook with an AMD CPU and the latest version of KDE Plasma desktop.
-
Monthly Sponsorship Includes Early Access to elementary OS 8
If you want to get a glimpse of what's in the pipeline for elementary OS 8, just set up a monthly sponsorship to help fund its continued existence.
-
DebConf24 to be Held in South Korea
Busan will be the location of the latest DebConf running July 28 through August 4