diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-09-24 22:52:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-26 18:04:17 -0700 |
| commit | e2f5f6ef6795c880a2f13ea472b96704b4a4ca94 (patch) | |
| tree | 026f1225da4579fbf0017f4cfe8a8e4b06e299d6 /git-merge.sh | |
| parent | Fix overzealous cleanliness check in git-merge (diff) | |
| download | tgif-e2f5f6ef6795c880a2f13ea472b96704b4a4ca94.tar.xz | |
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>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions