diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-30 14:48:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-31 02:28:45 (GMT) |
| commit | 38901a48375952ab6c02f22bddfa19ac2bec2c36 (patch) | |
| tree | e92bde1bc110e1456cd9980bce0ea80f49dae902 /config.mak.in | |
| parent | db9410990ee41f2b253763621c0023c782ec86e2 (diff) | |
| download | git-38901a48375952ab6c02f22bddfa19ac2bec2c36.zip git-38901a48375952ab6c02f22bddfa19ac2bec2c36.tar.gz git-38901a48375952ab6c02f22bddfa19ac2bec2c36.tar.bz2 | |
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>
Diffstat (limited to 'config.mak.in')
0 files changed, 0 insertions, 0 deletions