diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-09-24 19:20:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-24 19:20:26 -0700 |
| commit | 700899b624f368af6f2322fc10c6a0350d398694 (patch) | |
| tree | 8fae533f54b87636539a0cc89ae1419b18c925a9 /diffcore.h | |
| parent | Merge branch 'jl/daemon' (diff) | |
| parent | Add test for the default merges in fetch. (diff) | |
| download | tgif-700899b624f368af6f2322fc10c6a0350d398694.tar.xz | |
Merge branch 'sb/branch-attributes'
* sb/branch-attributes:
Add test for the default merges in fetch.
fetch: get the remote branches to merge from the branch properties
Add t5510 to test per branch configuration affecting git-fetch.
Fetch: default remote repository from branch properties
Diffstat (limited to 'diffcore.h')
0 files changed, 0 insertions, 0 deletions