From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Jul 2013 19:41:48 +0000 (-0700)
Subject: Merge branch 'kb/am-deprecate-resolved'
X-Git-Tag: v1.8.4-rc0~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b9a0deddcc643e5082739e7649ab745faf9e7fc;p=thirdparty%2Fgit.git

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
---

4b9a0deddcc643e5082739e7649ab745faf9e7fc