diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-10-03 12:05:53 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-10-03 12:05:53 +0000 |
| commit | 1b50ce9004d2296213fca188964ee273b87b2d12 (patch) | |
| tree | fce55ef06d77843213ec1fe5add1d9ff75e79a77 /git-merge.txt | |
| parent | 58992c945be1eab6cb6bc22216c90de22b30341f (diff) | |
| download | git-htmldocs-1b50ce9004d2296213fca188964ee273b87b2d12.tar.gz | |
Autogenerated HTML docs for v1.5.3.4-203-gcc61a
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-merge.txt b/git-merge.txt index eae49c487..bca4212e5 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -58,6 +58,10 @@ merge.verbosity:: above outputs debugging information. The default is level 2. Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable. +branch.<name>.mergeoptions:: + Sets default options for merging into branch <name>. The syntax and + supported options are equal to that of git-merge, but option values + containing whitespace characters are currently not supported. HOW MERGE WORKS --------------- |