diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-01 23:41:48 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-01 23:41:48 +0400 |
| commit | 4b9a0deddcc643e5082739e7649ab745faf9e7fc (patch) | |
| tree | ac9a40608c64d557781b130b52b786d21dadb61d /Documentation | |
| parent | 66929c423a83ceb9a81e0a298102bfd155a1689b (diff) | |
| parent | 8ceb6fbd63e2b3b82bbca0139a1696955aa753c6 (diff) | |
Merge branch 'kb/am-deprecate-resolved'
Promote "git am --continue" over "git am --resolved" for UI
consistency.
* kb/am-deprecate-resolved:
am: replace uses of --resolved with --continue
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-am.txt | 4 | ||||
| -rw-r--r-- | Documentation/user-manual.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 5bbe7b6d10..54d8461d61 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -132,7 +132,7 @@ default. You can use `--no-utf8` to override this. --resolvemsg=<msg>:: When a patch failure occurs, <msg> will be printed to the screen before exiting. This overrides the - standard message informing you to use `--resolved` + standard message informing you to use `--continue` or `--skip` to handle the failure. This is solely for internal use between 'git rebase' and 'git am'. @@ -176,7 +176,7 @@ aborts in the middle. You can recover from this in one of two ways: . hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should - have produced. Then run the command with the '--resolved' option. + have produced. Then run the command with the '--continue' option. The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 1bcf11b397..e364007d7c 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1841,7 +1841,7 @@ Once the index is updated with the results of the conflict resolution, instead of creating a new commit, just run ------------------------------------------------- -$ git am --resolved +$ git am --continue ------------------------------------------------- and Git will create the commit for you and continue applying the |