From: Junio C Hamano Date: Sun, 12 Apr 2009 23:46:42 +0000 (-0700) Subject: Merge branch 'sb/doc-upstream-branch' X-Git-Tag: v1.6.3-rc0~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c736becc94b1d3f026e1144731c17359a755d23f?ds=inline;hp=-c Merge branch 'sb/doc-upstream-branch' * sb/doc-upstream-branch: Documentation: Introduce "upstream branch" --- c736becc94b1d3f026e1144731c17359a755d23f diff --combined Documentation/config.txt index 3afd124749,77d3a8e31c..f3ebd2f9a0 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@@ -480,7 -480,7 +480,7 @@@ branch..remote: branch..merge:: Defines, together with branch..remote, the upstream branch for the given branch. It tells 'git-fetch'/'git-pull' which - branch to merge from. + branch to merge and can also affect 'git-push' (see push.default). When in branch , it tells 'git-fetch' the default refspec to be marked for merging in FETCH_HEAD. The value is handled like the remote part of a refspec, and must match a @@@ -715,13 -715,6 +715,13 @@@ format.thread: A true boolean value is the same as `shallow`, and a false value disables threading. +format.signoff:: + A boolean value which lets you enable the `-s/--signoff` option of + format-patch by default. *Note:* Adding the Signed-off-by: line to a + patch should be a conscious act and means that you certify you have + the rights to submit this work under the same open source license. + Please see the 'SubmittingPatches' document for further discussion. + gc.aggressiveWindow:: The window size parameter used in the delta compression algorithm used by 'git-gc --aggressive'. This defaults @@@ -1215,7 -1208,7 +1215,7 @@@ push.default: * `matching` push all matching branches. All branches having the same name in both ends are considered to be matching. This is the default. - * `tracking` push the current branch to the branch it is tracking. + * `tracking` push the current branch to its upstream branch. * `current` push the current branch to a branch of the same name. rebase.stat::