projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e137a89) | patch
Fix mismerge at cdb22c4 in builtin-checkout.c
authorJunio C Hamano <gitster@pobox.com>
Sun, 19 Oct 2008 22:32:35 +0000 (15:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 Oct 2008 22:32:42 +0000 (15:32 -0700)
commit828e32b82e3e2bb10d6d730d3abe505063b481f6
tree41aafda0561e699aaf2154024144eb7524c58547tree | snapshot
parente137a892d88cc40d7c0df45c06c08d144f7b3ce2commit | diff
Fix mismerge at cdb22c4 in builtin-checkout.c

The code to complain when -b is not given but an explicit --track/--no-track
override was given from the command line was unchanged on one branch and
reworked on the other branch.  The merge result incorrectly kept it.

Spotted by Matt McCutchen.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-checkout.c diff | blob | history
Git—the stupid content tracker