]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6b948a7 3ee1757)
Merge branch 'bc/maint-fetch-url-only'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Sep 2010 16:17:00 +0000 (09:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Sep 2010 16:17:00 +0000 (09:17 -0700)
commite250c5914fd151caf228cbda6c30560c266bcfef
tree8420c1badd4b4599d859f7f6ddab8fff5cf8bf14tree | snapshot
parent6b948a7a480b4ad5e112eb1642e9160e2a3b4f2bcommit | diff
parent3ee1757baeecb6fe6c8b2446b3afe0519584b63fcommit | diff
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
builtin/fetch.c diff1 | diff2 | blob | history
t/t5510-fetch.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.