Git {Tools}

Originally in Programming#Git, now Repository:.

From Mastering Git by Matthew McCullough, Tim Berglund, O'Reilly Media February 2011

• generating, starting the agent, adding key remotely then switching from HTTPS to SSH
  • git diff HEAD~2 == git diff HEAD^^
• git log --graph --pretty=oneline

git commands,
thus git command implied

From personal use

• last 10 modified branches
  • git branch --sort=-committerdate | head
• merge for single file from other branch
  • git checkout --merge otherbranch filename.ext
• search within branches
  • git grep "regexp" $(git rev-list --all)
• diff between branches
  • git diff branch1name branch2name path/to/file
  • git diff --stat ThisBranch..ThatOtherBranch
• precise merging across branches
  • git cherry-pick commitHash
  • cf http://stackoverflow.com/questions/1628563/move-the-most-recent-commits-to-a-new-branch-with-git
• getting back on track from old project
  • git for-each-ref --sort=-committerdate refs/heads/
  • git checkout lastModifiedBranch
  • git log -n 5 to find latest 5 commits
  • git show commitHash to find what was done precisely
• getting a password asked despite having the right SSH keys loaded
  • instead git clone ssh://myrep instead of git clone https://myrep https://help.github.com/articles/why-is-git-always-asking-for-my-password/
• getting error: src refspec master does not match any.
  • most likely trying to push on the wrong branch, i.e. non master branch
• config --glocal color.ui auto to enjoy git diff in color in the terminal
  • cf http://stackoverflow.com/questions/10998792/how-to-color-the-git-console-in-ubuntu
• bare/non-bare
  • bare repository (as repository/projectname.git/) works with gitweb but still displays no working repository
  • reset --hard HEAD works but does not sound proper if done after every post-receive (which currently have no effect)
  • Git bare vs. non-bare repositories by Kim N. Lesmer, bitflop 2010
  • http://sitaramc.github.com/concepts/bare.html
• wiki integration
  • moved to Programming#WikiIntegration (part of Programming#ImprovingProcess)
• config, rebase, add, commit -a -m "my msg", revert ^HEAD, ...
• gitweb
  • forcing $feature{'highlight'}{'default'} = [1]; in the /etc/gitweb.conf and making the CSS available via push @stylesheets, "http://fabien.benetou.fr/pub/images/repositoryshares/highlight.css";
• filter-branch --env-filter "export GIT_AUTHOR_NAME=Fabien Benetou; export GIT_AUTHOR_EMAIL=fabien@benetou.fr" HEAD@@
• push over ssh: (especially with ssh-agent running)
  • clone ssh://user@myserver.tld/path/to/my/repository
• gource in the current repository
  • cf gource, previously added to Programming#VisualizationOfCollaboration
• hooks
  • ideas too general to be only supported by git thus moved to Programming#ImprovingProcess
• Git from the bottom up by John Wigley, Lost in Technopolis 2008
  • recommended by Bastien Guerry aka bzg

To learn

• http://try.github.com
• https://github.com/hgarc014/git-game (~30min)

To explore

• progit.org
• related ideas in Mercurial#PotentialExtensions
• Why Git is Better Than X by Scott Chacon
• An Illustrated Guide to Git on Windows by Nathan J.
• git ready, learn git one commit at a time by Nick Quaranto
• GitCasts Git Screencasts

See also

• Programming#RCS
• Fossil
• Mercurial (aka Hg)

Note

My notes on Tools gather what I know or want to know. Consequently they are not and will never be complete references. For this, official manuals and online communities provide much better answers.