diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-05-09 05:46:08 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-05-09 05:46:08 +0000 |
| commit | 6d76d61fb621d158ee26238e735e282e33fb1a81 (patch) | |
| tree | edcabf096615344f6d597c38b9faf68b26ba024d /git-merge.txt | |
| parent | 47d68a53947d51de4f67b6b7e4e7f76e71e16fb5 (diff) | |
| download | git-htmldocs-6d76d61fb621d158ee26238e735e282e33fb1a81.tar.gz | |
Autogenerated HTML docs for v1.5.5.1-178-g1f81
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/git-merge.txt b/git-merge.txt index c136b1069..ef1f055c8 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -9,7 +9,7 @@ git-merge - Join two or more development histories together SYNOPSIS -------- [verse] -'git-merge' [-n] [--summary] [--no-commit] [--squash] [-s <strategy>]... +'git-merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]... [-m <msg>] <remote> <remote>... 'git-merge' <msg> HEAD <remote>... @@ -46,18 +46,7 @@ linkgit:git-reset[1]. CONFIGURATION ------------- - -merge.summary:: - Whether to include summaries of merged commits in newly - created merge commit. False by default. - -merge.verbosity:: - Controls the amount of output shown by the recursive merge - strategy. Level 0 outputs nothing except a final error - message if conflicts were detected. Level 1 outputs only - conflicts, 2 outputs conflicts and file changes. Level 5 and - above outputs debugging information. The default is level 2. - Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable. +include::merge-config.txt[] branch.<name>.mergeoptions:: Sets default options for merging into branch <name>. The syntax and |