![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 31 Aug 2008 02:44:17 +0000 (19:44 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 31 Aug 2008 02:44:26 +0000 (19:44 -0700) | ||
| commit | 29a1f99b4b81cd28163de1275265234c5ab804b4 | |
| tree | 8179b07340733b5e447b81117a9d82e651d8315c | tree | snapshot |
| parent | c236bcd06138bcbc929b86ad1a513635bf4847b2 | commit | diff |
| parent | 38901a48375952ab6c02f22bddfa19ac2bec2c36 | commit | diff |
Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'
* jc/maint-checkout-fix:
checkout --ours/--theirs: allow checking out one side of a conflicting merge
checkout -f: allow ignoring unmerged paths when checking out of the index
checkout: do not check out unmerged higher stages randomly
* jc/maint-checkout-fix:
checkout --ours/--theirs: allow checking out one side of a conflicting merge
checkout -f: allow ignoring unmerged paths when checking out of the index
checkout: do not check out unmerged higher stages randomly