]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 66929c4 8ceb6fb)
Merge branch 'kb/am-deprecate-resolved'
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Jul 2013 19:41:48 +0000 (12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Jul 2013 19:41:48 +0000 (12:41 -0700)
commit4b9a0deddcc643e5082739e7649ab745faf9e7fc
treeac9a40608c64d557781b130b52b786d21dadb61dtree | snapshot
parent66929c423a83ceb9a81e0a298102bfd155a1689bcommit | diff
parent8ceb6fbd63e2b3b82bbca0139a1696955aa753c6commit | 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
Documentation/user-manual.txt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.