diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-01 12:41:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-01 12:41:48 -0700 |
| commit | 4b9a0deddcc643e5082739e7649ab745faf9e7fc (patch) | |
| tree | ac9a40608c64d557781b130b52b786d21dadb61d /Documentation/user-manual.txt | |
| parent | 66929c423a83ceb9a81e0a298102bfd155a1689b (diff) | |
| parent | 8ceb6fbd63e2b3b82bbca0139a1696955aa753c6 (diff) | |
| download | git-4b9a0deddcc643e5082739e7649ab745faf9e7fc.tar.gz | |
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/user-manual.txt')
| -rw-r--r-- | Documentation/user-manual.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 |