diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-12 23:24:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-12 23:24:06 -0800 |
| commit | 1e2ccd3abc8f5d96244806f753568493c3e77d4c (patch) | |
| tree | 524282ab2ba2d33192eceac97968eb61307c6c5a /Documentation/git-am.txt | |
| parent | 180c4746479892a9e58918b0d45f89911cb48716 (diff) | |
| download | git-1e2ccd3abc8f5d96244806f753568493c3e77d4c.tar.gz | |
Documentation: more examples.
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, |