diff options
| author | Santi Béjar <sbejar@gmail.com> | 2006-09-23 22:53:04 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-24 00:13:49 -0700 |
| commit | 5372806a849cf117596b1f7c8c7d512c519f8092 (patch) | |
| tree | ab881a31a98e212723e78d882d0cd0c7f77d2032 /Documentation/config.txt | |
| parent | 7be1d62c6f6b322d826d145762db0050057aeb69 (diff) | |
| download | git-5372806a849cf117596b1f7c8c7d512c519f8092.tar.gz | |
fetch: get the remote branches to merge from the branch properties
If in branch "foo" and this in config:
[branch "foo"]
merge=bar
"git fetch": fetch from the default repository and program the "bar"
branch to be merged with pull.
Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 04c5094fdd..98c1f3e2e3 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -122,6 +122,10 @@ apply.whitespace:: branch.<name>.remote:: When in branch <name>, it tells `git fetch` which remote to fetch. +branch.<name>.merge:: + When in branch <name>, it tells `git fetch` the default remote branch + to be merged. + pager.color:: A boolean to enable/disable colored output when the pager is in use (default is true). |