diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-01 17:57:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-01 17:57:16 -0700 |
| commit | ffc5e3c958b66fb4babeba01483cc924bc2957a5 (patch) | |
| tree | 4cea1fc19bb4b720d04ac102c2a30f6dec864679 /Documentation/merge-config.txt | |
| parent | b966427b53b246e722df1e5502b9145eb9dd063a (diff) | |
| parent | 93e535a5b78c9861eca3e9371d1c3e5173c0ab02 (diff) | |
| download | git-ffc5e3c958b66fb4babeba01483cc924bc2957a5.tar.gz | |
Merge branch 'jc/merge-sans-branch'
* jc/merge-sans-branch:
merge: merge with the default upstream branch without argument
merge: match the help text with the documentation
Conflicts:
builtin/merge.c
Diffstat (limited to 'Documentation/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 33bf74c334..8920258baa 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -6,6 +6,16 @@ merge.conflictstyle:: a `>>>>>>>` marker. An alternate style, "diff3", adds a `|||||||` marker and the original text before the `=======` marker. +merge.defaultToUpstream:: + If merge is called without any commit argument, merge the upstream + branches configured for the current branch by using their last + observed values stored in their remote tracking branches. + The values of the `branch.<current branch>.merge` that name the + branches at the remote named by `branch.<current branch>.remote` + are consulted, and then they are mapped via `remote.<remote>.fetch` + to their corresponding remote tracking branches, and the tips of + these tracking branches are merged. + merge.log:: In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the |