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 /git-pull.sh | |
| parent | Merge branch 'rr/column-doc' (diff) | |
| parent | am: replace uses of --resolved with --continue (diff) | |
| download | tgif-4b9a0deddcc643e5082739e7649ab745faf9e7fc.tar.xz | |
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 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions