diff options
| author | Jeff King <peff@peff.net> | 2010-02-11 22:27:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-12 06:10:00 (GMT) |
| commit | c8089af6c6754153d75de74d0f147adcd46a6b59 (patch) | |
| tree | 8090406f0146e1168796d05880715771ed561981 /builtin-merge-recursive.c | |
| parent | f476c0b7b30b26157b4a12b565a08a3c015edf6d (diff) | |
| download | git-c8089af6c6754153d75de74d0f147adcd46a6b59.zip git-c8089af6c6754153d75de74d0f147adcd46a6b59.tar.gz git-c8089af6c6754153d75de74d0f147adcd46a6b59.tar.bz2 | |
am: switch --resolved to --continue
Rebase calls this same function "--continue", which means
users may be trained to type it. There is no reason to
deprecate --resolved (or -r), so we will keep it as a
synonym.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions