![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 12 Jan 2006 07:07:27 +0000 (23:07 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 14 Jan 2006 00:52:37 +0000 (16:52 -0800) | ||
| commit | 19205acfc29b6d39b5643a7f9a2448f89df14355 | |
| tree | 18c617363cfae6b12b36e659b424eefb85db1e46 | tree | snapshot |
| parent | 429608fc365d4e6e0db9dee72a0b103dce578722 | commit | diff |
checkout: automerge local changes while switching branches.
When switching branches, if the working tree has a local
modification at paths that are different between current and new
branches, we refused the operation saying "cannot merge." This
attempts to do an automerge for such paths.
This is still experimental.
Signed-off-by: Junio C Hamano <junkio@cox.net>
When switching branches, if the working tree has a local
modification at paths that are different between current and new
branches, we refused the operation saying "cannot merge." This
attempts to do an automerge for such paths.
This is still experimental.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-checkout.sh | diff | blob | history |