Code

Merge branch 'js/maint-fetch-update-head' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 2 Nov 2008 21:37:16 +0000 (13:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 2 Nov 2008 21:37:16 +0000 (13:37 -0800)
* 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


Trivial merge