Tips from the experts on getting more from Git
Tip 7: In Memoriam Mercurial
Veteran developer Lenz Grimmer wrote: "Our team is involved in the development of the Ceph management solution openATTIC and its successor, the Ceph Dashboard. We migrated our openATTIC code repository from Mercurial to Git in April 2017 [13]. As former Mercurial users, we missed a few commands in Git, which we reverse engineered as aliases in ~/.gitconfig." See Listing 3 for some of our favorites.
Listing 3
Useful Aliases for Mercurial Users
Tip 8: Spring Cleaning
Stephan Müller integrated the function from Listing 4 into his zshrc to make life easier with Git and submodules. But be careful, this function will clean up completely and irretrievably. After this command, all submodules are as clean as after a new clone process!
Listing 4
Cleaning up the Submodules
Tip 9: git-vimdiff
Matt Oliver mentioned the benefits of git-vimdiff [14]. In addition to the normal vimdiff, which can also be connected to Git, git-vimdiff (Figure 4) offers each file in a separate tab. Vim users can conveniently scroll back and forth through them. "I use this so often now: Every time I go through a new patch set in Gerrit or GitHub, I just jump into the branch and call git vimdiff HEAD~." You can then go through the diffs one by one and read the reviewer comments in parallel.
Figure 4: SUSE developer Matt Oliver calls git-vimdiff "one of the most productive git hacks I use regularly."
Buy this article as PDF
(incl. VAT)
Buy Linux Magazine
US / Canada
UK / Australia
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
-
TUXEDO Computers Unveils Linux Laptop Featuring AMD Ryzen CPU
This latest release is the first laptop to include the new CPU from Ryzen and Linux preinstalled.
-
XZ Gets the All-Clear
The back door xz vulnerability has been officially reverted for Fedora 40 and versions 38 and 39 were never affected.
-
Canonical Collaborates with Qualcomm on New Venture
This new joint effort is geared toward bringing Ubuntu and Ubuntu Core to Qualcomm-powered devices.
-
Kodi 21.0 Open-Source Entertainment Hub Released
After a year of development, the award-winning Kodi cross-platform, media center software is now available with many new additions and improvements.
-
Linux Usage Increases in Two Key Areas
If market share is your thing, you'll be happy to know that Linux is on the rise in two areas that, if they keep climbing, could have serious meaning for Linux's future.
-
Vulnerability Discovered in xz Libraries
An urgent alert for Fedora 40 has been posted and users should pay attention.
-
Canonical Bumps LTS Support to 12 years
If you're worried that your Ubuntu LTS release won't be supported long enough to last, Canonical has a surprise for you in the form of 12 years of security coverage.
-
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.