projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a157400 b0ad11e)
Merge branch 'js/maint-fetch-update-head'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Oct 2008 00:58:21 +0000 (17:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Oct 2008 00:58:21 +0000 (17:58 -0700)
commitca6c06b2efe2f55c498670efcb419bce35678e03
tree741239f028d57d825b8bbd66df8271ad0576bbe0tree | snapshot
parenta157400c972bbdeab2b5629658c99839c855f5abcommit | diff
parentb0ad11ea165e07308fc02a5091efbe2e2d22237ccommit | diff
Merge branch 'js/maint-fetch-update-head'

* js/maint-fetch-update-head:
  pull: allow "git pull origin $something:$current_branch" into an unborn branch
  Fix fetch/pull when run without --update-head-ok

Conflicts:
t/t5510-fetch.sh
builtin-fetch.c diff1 | diff2 | blob | history
t/t5510-fetch.sh diff1 | diff2 | blob | history
t/t9300-fast-import.sh diff1 | diff2 | blob | history
Git—the stupid content tracker