| commit | c1a4278ee3f99ca9db94bd032b047b3d19ac6e5f | |
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 17 Jan 2007 04:46:39 +0000 (16 20:46 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 17 Jan 2007 05:32:06 +0000 (16 21:32 -0800) | ||
| tree | 1122009dda16c2a8a31851018c921dd9a9538afc | treesnapshot (tar.gz zip) |
| parent | 7905ba626e14c32d09a412c168931486ceedb6ec | commitdiff |
Use merge-recursive in git-checkout -m (branch switching)
This allows "git checkout -m <other-branch>" to notice renames and
carry local changes in the working tree forward.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This allows "git checkout -m <other-branch>" to notice renames and
carry local changes in the working tree forward.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-checkout.sh | diffblobblamehistory | |
| t/t7201-co.sh | diffblobblamehistory |