summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-22 21:56:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-22 21:56:13 (GMT)
commit1ea9f9d6c28caf886747ca256e9d39d24f03d229 (patch)
treef3b25e33337c23054f8e979ee16a91f1d1bbffee /Documentation
parentc2e86addb86689306b992065328ec52aa2479658 (diff)
parentb5f306fbe1bf1a75341f85b84358d25870b010f3 (diff)
downloadgit-1ea9f9d6c28caf886747ca256e9d39d24f03d229.zip
git-1ea9f9d6c28caf886747ca256e9d39d24f03d229.tar.gz
git-1ea9f9d6c28caf886747ca256e9d39d24f03d229.tar.bz2
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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-am.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 621b720..6b1b5af 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -173,9 +173,9 @@ aborts in the middle. You can recover from this in one of two ways:
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