| commit | 5372806a849cf117596b1f7c8c7d512c519f8092 | |
| author | Santi Béjar <sbejar@gmail.com> | |
| Sat, 23 Sep 2006 20:53:04 +0000 (23 22:53 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 24 Sep 2006 07:13:49 +0000 (24 00:13 -0700) | ||
| tree | ab881a31a98e212723e78d882d0cd0c7f77d2032 | treesnapshot (tar.gz zip) |
| parent | 7be1d62c6f6b322d826d145762db0050057aeb69 | commitdiff |
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>
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>
| Documentation/config.txt | diffblobblamehistory | |
| git-parse-remote.sh | diffblobblamehistory |