<p><em>Please, add your favorite cool and unusual Git techniques to this guide!</em></p> <h2>git add --patch</h2> <p>Lets you commit specific lines rather than whole files.</p> <ul> <li><a href="http://tomayko.com/writings/the-thing-about-git">The Thing About Git</a></li> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/git-add.html">git add manpage</a></li> </ul> <h2>git add --interactive</h2> <p><code>--interactive</code> works very similar to <code>--patch</code>, but gives you much more flexibility in choosing what (untracked) files and/or hunks you want to stage.</p> <ul> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/git-add.html">git add manpage</a></li> </ul> <h2>git stash</h2> <p>Stash away the uncommited changes in your working directory to get a clean <span class="caps">HEAD</span>.</p> <ul> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/git-stash.html">git stash manpage</a></li> </ul> <h2>Rebasing</h2> <!-- I'm just guessing it is messy with forks, is it why we don't repush rebased commits? --><p><em>Rebasing is neat for cleaning up commits, but you will generally <strong>not want to rebase already pushed commits</strong> &#8211; it becomes messy for others who are working on forks of your repository. If for some reason you really do want to repush rebased commits, you will need to <code>git push -f</code>.</em></p> <h3>git commit --amend</h3> <p>Add your changes to the last commit instead of a new one.</p> <ul> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/git-commit.html">git commit manpage</a></li> </ul> <h3>git rebase --interactive</h3> <p>Rearrange, edit and squash commits.</p> <ul> <li><a href="http://blog.madism.org/index.php/2007/09/09/138-git-awsome-ness-git-rebase-interactive">git awesome-ness</a></li> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html">git rebase manpage</a></li> </ul> <h2>git cherry-pick</h2> <p>Want to grab only one commit from someone else&#8217;s repository? First fetch their changes and then apply the individual commit with <code>git cherry-pick 1111111</code> (where 1111111 is the beginning of the sha1 hash of the commit you want to apply).</p> <ul> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/git-cherry-pick.html">git cherry-pick manpage</a></li> </ul> 2008-04-09T00:32:50-07:00 26 cool-and-unusual-git-techniques 2009-03-08T07:32:59-07:00 14644