X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-am.txt;h=e4df4a46ec0461e32865732a33057b284159f001;hb=6ddc0964034342519a87fe013781abf31c6db6ad;hp=88068d09f55c4177309da5308632f7a172f591de;hpb=4ae22d96fe9248dac4f26b1fc91154ba5e879799;p=git.git diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 88068d09..e4df4a46 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -1,5 +1,5 @@ git-am(1) -================ +========= NAME ---- @@ -58,10 +58,10 @@ recover from this in one of two ways: . hand resolve the conflict in the working directory, run 'git diff HEAD' to extract the merge result into a patch form and - replacing the patch part of the message in .dotest directory. - After doing this, run `git-reset --hard HEAD` to bring the - working tree to the state before half-applying the patch, then - re-run the command without any options. + replacing the patch in .dotest/patch file. After doing this, + run `git-reset --hard HEAD` to bring the working tree to the + state before half-applying the patch, then re-run the command + without any options. The command refuses to process new mailboxes while `.dotest` directory exists, so if you decide to start over from scratch, @@ -82,8 +82,6 @@ Documentation -------------- Documentation by Petr Baudis, Junio C Hamano and the git-list . -This manual page is a stub. You can help the git documentation by expanding it. - GIT --- Part of the gitlink:git[7] suite