diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-14 17:30:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-14 17:30:03 -0800 |
| commit | 1ed91937e5cd59fdbdfa5f15f6fac132d2b21ce0 (patch) | |
| tree | f65b929c006c31043213152752ea0c80bf08b9e5 /Documentation/git-am.txt | |
| parent | a9572072f0ab0ac97e64b0dc01254a3ad95befe1 (diff) | |
| parent | 294c695d8cfbcf95a5c33fc6ba386f496964defb (diff) | |
| download | git-1.0rc6.tar.xz | |
Oh, I hate to do this but I ended up merging big usage string
cleanups from Fredrik, git-am enhancements that made a lot of
sense for non mbox users from HPA, and rebase changes (done
independently by me and Lukas) among other things, so git is
still in perpetual state of 1.0rc. 1.0 will probably be next
Wednesday, but who knows.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 6645e82b84..a415fe24c3 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -69,7 +69,7 @@ recover from this in one of two ways: . hand resolve the conflict in the working directory, and update the index file to bring it in a state that the patch should - have produced. Then run the command with '--resume' option. + have produced. Then run the command with '--resolved' option. The command refuses to process new mailboxes while `.dotest` directory exists, so if you decide to start over from scratch, |