![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 30 Aug 2008 14:48:18 +0000 (07:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 31 Aug 2008 02:28:45 +0000 (19:28 -0700) | ||
| commit | 38901a48375952ab6c02f22bddfa19ac2bec2c36 | |
| tree | e92bde1bc110e1456cd9980bce0ea80f49dae902 | tree | snapshot |
| parent | db9410990ee41f2b253763621c0023c782ec86e2 | commit | diff |
checkout --ours/--theirs: allow checking out one side of a conflicting merge
This lets you to check out 'our' (or 'their') version of an
unmerged path out of the index while resolving conflicts.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This lets you to check out 'our' (or 'their') version of an
unmerged path out of the index while resolving conflicts.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-checkout.txt | diff | blob | history | |
| builtin-checkout.c | diff | blob | history | |
| t/t7201-co.sh | diff | blob | history |