diff options
| author | Santi Béjar <sbejar@gmail.com> | 2006-09-23 20:53:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-24 07:13:49 (GMT) |
| commit | 5372806a849cf117596b1f7c8c7d512c519f8092 (patch) | |
| tree | ab881a31a98e212723e78d882d0cd0c7f77d2032 /xdiff | |
| parent | 7be1d62c6f6b322d826d145762db0050057aeb69 (diff) | |
| download | git-5372806a849cf117596b1f7c8c7d512c519f8092.zip git-5372806a849cf117596b1f7c8c7d512c519f8092.tar.gz git-5372806a849cf117596b1f7c8c7d512c519f8092.tar.bz2 | |
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 'xdiff')
0 files changed, 0 insertions, 0 deletions