Merge branch 'js/maint-fetch-update-head' into maint
commitf6276b788f26c3c148c2d5465a6b03fc09bb785c
authorJunio C Hamano <gitster@pobox.com>
Sun, 2 Nov 2008 21:37:16 +0000 (2 13:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 2 Nov 2008 21:37:16 +0000 (2 13:37 -0800)
tree51087b88150e40113d3c90f3822f0e0c9e5a4caa
parent86e67a088c581da4da36acf0edd8c27b1033e51e
parentb0ad11ea165e07308fc02a5091efbe2e2d22237c
Merge branch 'js/maint-fetch-update-head' into maint

* 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