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 /Documentation/git-checkout.txt | |
| 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 'Documentation/git-checkout.txt')
| -rw-r--r-- | Documentation/git-checkout.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 15fdb08..a9ca2f5 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git checkout' [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>] -'git checkout' [-f] [<tree-ish>] [--] <paths>... +'git checkout' [-f|--ours|--theirs] [<tree-ish>] [--] <paths>... DESCRIPTION ----------- @@ -33,7 +33,9 @@ working tree. The index may contain unmerged entries after a failed merge. By default, if you try to check out such an entry from the index, the checkout operation will fail and nothing will be checked out. -Using -f will ignore these unmerged entries. +Using -f will ignore these unmerged entries. The contents from a +specific side of the merge can be checked out of the index by +using --ours or --theirs. OPTIONS ------- @@ -48,6 +50,11 @@ OPTIONS When checking out paths from the index, do not fail upon unmerged entries; instead, unmerged entries are ignored. +--ours:: +--theirs:: + When checking out paths from the index, check out stage #2 + ('ours') or #3 ('theirs') for unmerged paths. + -b:: Create a new branch named <new_branch> and start it at <branch>. The new branch name must pass all checks defined |