]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f476c0b) | patch
am: switch --resolved to --continue
authorJeff King <peff@peff.net>
Thu, 11 Feb 2010 22:27:14 +0000 (17:27 -0500)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Feb 2010 06:10:00 +0000 (22:10 -0800)
commitc8089af6c6754153d75de74d0f147adcd46a6b59
tree8090406f0146e1168796d05880715771ed561981tree | snapshot
parentf476c0b7b30b26157b4a12b565a08a3c015edf6dcommit | diff
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>
Documentation/git-am.txt diff | blob | blame | history
git-am.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.