diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-09-08 09:17:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-08 09:17:00 -0700 |
| commit | e250c5914fd151caf228cbda6c30560c266bcfef (patch) | |
| tree | 8420c1badd4b4599d859f7f6ddab8fff5cf8bf14 /git.c | |
| parent | Merge branch 'jk/maint-pass-c-config-in-env' (diff) | |
| parent | builtin/fetch.c: ignore merge config when not fetching from branch's remote (diff) | |
| download | tgif-e250c5914fd151caf228cbda6c30560c266bcfef.tar.xz | |
Merge branch 'bc/maint-fetch-url-only'
* bc/maint-fetch-url-only:
builtin/fetch.c: ignore merge config when not fetching from branch's remote
t/t5510: demonstrate failure to fetch when current branch has merge ref
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions