diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-29 13:40:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-30 16:46:25 -0700 |
| commit | 8fdcf3125465f70c0cad5be5ab192d46e46307c7 (patch) | |
| tree | 9146b01c85b07f5211eae66cf575d78dc69950ab /Documentation/RelNotes-1.5.1.1.txt | |
| parent | tutorial: gentler illustration of Alice/Bob workflow using gitk (diff) | |
| download | tgif-8fdcf3125465f70c0cad5be5ab192d46e46307c7.tar.xz | |
checkout: do not check out unmerged higher stages randomly
During a conflicted merge when you have unmerged stages for a
path F in the index, if you said:
$ git checkout F
we rewrote F as many times as we have stages for it, and the
last one (typically "theirs") was left in the work tree, without
resolving the conflict.
This fixes it by noticing that a specified pathspec pattern
matches an unmerged path, and by erroring out.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes-1.5.1.1.txt')
0 files changed, 0 insertions, 0 deletions