diff options
| author |  Paul Tan <pyokagan@gmail.com> | 2015-08-04 21:52:03 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-08-04 22:02:11 -0700 |
| commit | 7ff26832535a83bd8d75beefbf822d965e066961 (patch) | |
| tree | c63a9e348d497bd430337cd78a910a5519377b11 /update_unicode.sh | |
| parent | builtin-am: support and auto-detect mercurial patches (diff) | |
| download | tgif-7ff26832535a83bd8d75beefbf822d965e066961.tar.xz | |
builtin-am: implement -i/--interactive
Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07),
git-am.sh supported the --interactive mode. After parsing the patch mail
and extracting the patch, commit message and authorship info, an
interactive session will begin that allows the user to choose between:
* applying the patch
* applying the patch and all subsequent patches (by disabling
interactive mode in subsequent patches)
* skipping the patch
* editing the commit message
Since f89ad67 (Add [v]iew patch in git-am interactive., 2005-10-25),
git-am.sh --interactive also supported viewing the patch to be applied.
When --resolved-ing in --interactive mode, we need to take care to
update the patch with the contents of the index, such that the correct
patch will be displayed when the patch is viewed in interactive mode.
Re-implement the above in builtin/am.c
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'update_unicode.sh')
0 files changed, 0 insertions, 0 deletions