![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Mar 2011 21:56:13 +0000 (14:56 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Mar 2011 21:56:13 +0000 (14:56 -0700) | ||
| commit | 1ea9f9d6c28caf886747ca256e9d39d24f03d229 | |
| tree | f3b25e33337c23054f8e979ee16a91f1d1bbffee | tree | snapshot |
| parent | c2e86addb86689306b992065328ec52aa2479658 | commit | diff |
| parent | b5f306fbe1bf1a75341f85b84358d25870b010f3 | commit | diff |
Merge branch 'maint'
* maint:
git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'
bisect: visualize with git-log if gitk is unavailable
* maint:
git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'
bisect: visualize with git-log if gitk is unavailable
| Documentation/git-am.txt | diff1 | | diff2 | | blob | history |