diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-04 00:06:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-04 00:18:29 -0800 |
| commit | 3746501664e3fcf6c44080cb599b50bf9cbea2be (patch) | |
| tree | d032e26b9d623a605fb9f8941e96ad62a7344aa3 /Documentation/git-merge.txt | |
| parent | 810bf1f9448c1db7f52cfa43c077c677fb080fce (diff) | |
| download | git-3746501664e3fcf6c44080cb599b50bf9cbea2be.tar.gz | |
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-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 8c9c4d87e3..da6537d911 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -8,7 +8,7 @@ git-merge - Grand Unified Merge Driver SYNOPSIS -------- -'git-merge' [-n] [-s <strategy>]... <msg> <head> <remote> <remote>... +'git-merge' [-n] [--no-commit] [-s <strategy>]... <msg> <head> <remote> <remote>... DESCRIPTION @@ -19,14 +19,7 @@ which drives multiple merge strategy scripts. OPTIONS ------- --n:: - Do not show diffstat at the end of the merge. - --s <strategy>:: - use that merge strategy; can be given more than once to - specify them in the order they should be tried. If - there is no `-s` option, built-in list of strategies is - used instead. +include::merge-pull-opts.txt[] <msg>:: The commit message to be used for the merge commit (in case |