| commit | 828e32b82e3e2bb10d6d730d3abe505063b481f6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 Oct 2008 22:32:35 +0000 (19 15:32 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 Oct 2008 22:32:42 +0000 (19 15:32 -0700) | ||
| tree | 41aafda0561e699aaf2154024144eb7524c58547 | treesnapshot (tar.gz zip) |
| parent | e137a892d88cc40d7c0df45c06c08d144f7b3ce2 | commitdiff |
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>
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 | diffblobblamehistory |