| commit | 4b9a0deddcc643e5082739e7649ab745faf9e7fc | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Jul 2013 19:41:48 +0000 (1 12:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Jul 2013 19:41:48 +0000 (1 12:41 -0700) | ||
| tree | ac9a40608c64d557781b130b52b786d21dadb61d | treesnapshot (tar.gz zip) |
| parent | 66929c423a83ceb9a81e0a298102bfd155a1689b | commitdiff |
| parent | 8ceb6fbd63e2b3b82bbca0139a1696955aa753c6 | commitdiff |
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
Promote "git am --continue" over "git am --resolved" for UI
consistency.
* kb/am-deprecate-resolved:
am: replace uses of --resolved with --continue
| Documentation/user-manual.txt | diff1 | diff2 | blobhistory |