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

diff --combined Documentation/git-am.txt
index 621b720091f92008c11a03ea2a1e69b72e50a03b,4d37de639dd6f6deaf2c52231c0ae879cd30f23d..6b1b5af64e2daec1ecc8ee832f58f5186d740a79
--- 1/Documentation/git-am.txt
--- 2/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@@ -173,9 -173,9 +173,9 @@@ aborts in the middle.  You can recover 
    the index file to bring it into a state that the patch should
    have produced.  Then run the command with the '--resolved' option.
  
- The command refuses to process new mailboxes while the `.git/rebase-apply`
- directory exists, so if you decide to start over from scratch,
- run `rm -f -r .git/rebase-apply` before running the command with mailbox
+ The command refuses to process new mailboxes until the current
+ operation is finished, so if you decide to start over from scratch,
+ run `git am --abort` before running the command with mailbox
  names.
  
  Before any patches are applied, ORIG_HEAD is set to the tip of the
@@@ -189,6 -189,15 +189,6 @@@ SEE ALS
  --------
  linkgit:git-apply[1].
  
 -
 -Author
 -------
 -Written by Junio C Hamano <gitster@pobox.com>
 -
 -Documentation
 ---------------
 -Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.
 -
  GIT
  ---
  Part of the linkgit:git[1] suite