| commit | c8089af6c6754153d75de74d0f147adcd46a6b59 | |
| author | Jeff King <peff@peff.net> | |
| Thu, 11 Feb 2010 22:27:14 +0000 (11 17:27 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Feb 2010 06:10:00 +0000 (11 22:10 -0800) | ||
| tree | 8090406f0146e1168796d05880715771ed561981 | treesnapshot (tar.gz zip) |
| parent | f476c0b7b30b26157b4a12b565a08a3c015edf6d | commitdiff |
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>
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>
| Documentation/git-am.txt | diffblobblamehistory | |
| git-am.sh | diffblobblamehistory |