summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-04 08:06:20 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-04 08:18:29 (GMT)
commit3746501664e3fcf6c44080cb599b50bf9cbea2be (patch)
treed032e26b9d623a605fb9f8941e96ad62a7344aa3 /Documentation/git-pull.txt
parent810bf1f9448c1db7f52cfa43c077c677fb080fce (diff)
downloadgit-3746501664e3fcf6c44080cb599b50bf9cbea2be.zip
git-3746501664e3fcf6c44080cb599b50bf9cbea2be.tar.gz
git-3746501664e3fcf6c44080cb599b50bf9cbea2be.tar.bz2
Documentation: -merge and -pull: describe merge strategies.
... and give a couple of examples of running 'git pull' against local repository. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-pull.txt')
-rw-r--r--Documentation/git-pull.txt68
1 files changed, 67 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index cef4c0a..2f8a9ce 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -8,7 +8,7 @@ git-pull - Pull and merge from another repository.
SYNOPSIS
--------
-'git-pull' <repository> <refspec>...
+'git-pull' <options> <repository> <refspec>...
DESCRIPTION
@@ -32,6 +32,72 @@ include::pull-fetch-param.txt[]
existing contents of $GIT_DIR/FETCH_HEAD. Without this
option old data in $GIT_DIR/FETCH_HEAD will be overwritten.
+include::merge-pull-opts.txt[]
+
+
+MERGE STRATEGIES
+----------------
+
+resolve::
+ This can only resolve two heads (i.e. the current branch
+ and another branch you pulled from) using 3-way merge
+ algorithm. It tries to carefully detect criss-cross
+ merge ambiguities and is considered generally safe and
+ fast. This is the default merge strategy when pulling
+ one branch.
+
+recursive::
+ This can only resolve two heads using 3-way merge
+ algorithm. When there are more than one common
+ ancestors that can be used for 3-way merge, it creates a
+ merged tree of the common ancestores and uses that as
+ the reference tree for the 3-way merge. This has been
+ reported to result in fewer merge conflicts without
+ causing mis-merges by tests done on actual merge commits
+ taken from Linux 2.6 kernel development history.
+ Additionally this can detect and handle merges involving
+ renames.
+
+octopus::
+ This resolves more than two-head case, but refuses to do
+ complex merge that needs manual resolution. It is
+ primarily meant to be used for bundling topic branch
+ heads together. This is the default merge strategy when
+ pulling 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
+ be used to supersede old development history of side
+ branches.
+
+
+EXAMPLES
+--------
+
+git pull, git pull origin::
+ Fetch the default head from the repository you cloned
+ from and merge it into your current branch.
+
+git pull -s ours . obsolete::
+ Merge local branch `obsolete` into the current branch,
+ using `ours` merge strategy.
+
+git pull . fixes enhancements::
+ Bundle local branch `fixes` and `enhancements` on top of
+ the current branch, making an Octopus merge.
+
+git pull --no-commit . maint::
+ Merge local branch `maint` into the current branch, but
+ do not make a commit automatically. This can be used
+ when you want to include further changes to the merge,
+ or want to write your own merge commit message.
++
+You should refrain from abusing this option to sneak substantial
+changes into a merge commit. Small fixups like bumping
+release/version name would be acceptable.
+
+
Author
------
Written by Linus Torvalds <torvalds@osdl.org>