Merge branch 'maint'
commit1ea9f9d6c28caf886747ca256e9d39d24f03d229
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Mar 2011 21:56:13 +0000 (22 14:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Mar 2011 21:56:13 +0000 (22 14:56 -0700)
treef3b25e33337c23054f8e979ee16a91f1d1bbffee
parentc2e86addb86689306b992065328ec52aa2479658
parentb5f306fbe1bf1a75341f85b84358d25870b010f3
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
Documentation/git-am.txt