author | Junio C Hamano <junkio@cox.net> | |
Sun, 25 Sep 2005 05:52:32 +0000 (22:52 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Tue, 27 Sep 2005 01:04:17 +0000 (18:04 -0700) | ||
commit | e2f5f6ef6795c880a2f13ea472b96704b4a4ca94 | |
tree | 026f1225da4579fbf0017f4cfe8a8e4b06e299d6 | tree | snapshot |
parent | a935824036dc2c5a8ef1980a4b05a12228712754 | commit | diff |
Do not require clean tree when reverting and cherry-picking.
My stupidity deserved to be yelled at by Linus ... there is no reason
to require the working tree to be clean when merging -- the only
requirements are index to match HEAD commit and the paths involved in
merge are up to date in the working tree. Revert and cherry-pick are
just specialized forms of merge, and the requirements should be the
same.
Remove the 'general purpose routine to make sure tree is clean' from
git-sh-setup, to prevent me from getting tempted again.
Signed-off-by: Junio C Hamano <junkio@cox.net>
My stupidity deserved to be yelled at by Linus ... there is no reason
to require the working tree to be clean when merging -- the only
requirements are index to match HEAD commit and the paths involved in
merge are up to date in the working tree. Revert and cherry-pick are
just specialized forms of merge, and the requirements should be the
same.
Remove the 'general purpose routine to make sure tree is clean' from
git-sh-setup, to prevent me from getting tempted again.
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-revert.sh | diff | blob | history | |
git-sh-setup.sh | diff | blob | history |