summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2009-11-15 18:25:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-11-15 20:26:08 (GMT)
commitd4cbaa12a774a97dfa9e99aad9188dc802469bb6 (patch)
treed8a46448db193f3c7c725a6df61b8e94426d260b
parent78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff)
downloadgit-d4cbaa12a774a97dfa9e99aad9188dc802469bb6.zip
git-d4cbaa12a774a97dfa9e99aad9188dc802469bb6.tar.gz
git-d4cbaa12a774a97dfa9e99aad9188dc802469bb6.tar.bz2
Documentation: clarify 'ours' merge strategy
Make it clear in the docs that the merge takes the tree of HEAD and ignores everything in the other branches. This should hopefully clear up confusion, usually caused by the user looking for a strategy that resolves all conflict hunks in favour of HEAD (which is completely different and currently not supported). Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/merge-strategies.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 4365b7e..42910a3 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -29,8 +29,9 @@ octopus::
pulling or merging more than one branch.
ours::
- This resolves any number of heads, but the result of the
- merge is always the current branch head. It is meant to
+ This resolves any number of heads, but the resulting tree of the
+ merge is always that of the current branch head, effectively
+ ignoring all changes from all other branches. It is meant to
be used to supersede old development history of side
branches.