diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-16 20:46:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-16 21:32:06 -0800 |
| commit | c1a4278ee3f99ca9db94bd032b047b3d19ac6e5f (patch) | |
| tree | 1122009dda16c2a8a31851018c921dd9a9538afc /merge-file.c | |
| parent | 7905ba626e14c32d09a412c168931486ceedb6ec (diff) | |
| download | git-c1a4278ee3f99ca9db94bd032b047b3d19ac6e5f.tar.gz git-c1a4278ee3f99ca9db94bd032b047b3d19ac6e5f.tar.xz | |
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>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions