From: Paul Tan <pyokagan@gmail.com>
Date: Tue, 4 Aug 2015 13:51:32 +0000 (+0800)
Subject: builtin-am: implement --resolved/--continue
X-Git-Tag: v2.6.0-rc0~77^2~35
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/240bfd2de9a7aec31240300ba1d7e89c59dbafe9?hp=240bfd2de9a7aec31240300ba1d7e89c59dbafe9

builtin-am: implement --resolved/--continue

Since 0c15cc9 (git-am: --resolved., 2005-11-16), git-am supported
resuming from a failed patch application. The user will manually apply
the patch, and the run git am --resolved which will then commit the
resulting index. Re-implement this feature by introducing am_resolve().

Since it makes no sense for the user to run am --resolved when there is
no session in progress, we error out in this case.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---