aboutsummaryrefslogtreecommitdiff
path: root/wt-status.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-08 09:17:00 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-08 09:17:00 -0700
commite250c5914fd151caf228cbda6c30560c266bcfef (patch)
tree8420c1badd4b4599d859f7f6ddab8fff5cf8bf14 /wt-status.h
parent6b948a7a480b4ad5e112eb1642e9160e2a3b4f2b (diff)
parent3ee1757baeecb6fe6c8b2446b3afe0519584b63f (diff)
downloadgit-e250c5914fd151caf228cbda6c30560c266bcfef.tar.gz
git-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 'wt-status.h')
0 files changed, 0 insertions, 0 deletions