Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Mar 2011 21:56:13 +0000 (14:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Mar 2011 21:56:13 +0000 (14:56 -0700)
* maint:
  git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'
  bisect: visualize with git-log if gitk is unavailable

1  2 
Documentation/git-am.txt

Simple merge