diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-21 17:58:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-21 17:58:21 -0700 |
| commit | ca6c06b2efe2f55c498670efcb419bce35678e03 (patch) | |
| tree | 741239f028d57d825b8bbd66df8271ad0576bbe0 /var.c | |
| parent | a157400c972bbdeab2b5629658c99839c855f5ab (diff) | |
| parent | b0ad11ea165e07308fc02a5091efbe2e2d22237c (diff) | |
| download | git-ca6c06b2efe2f55c498670efcb419bce35678e03.tar.gz git-ca6c06b2efe2f55c498670efcb419bce35678e03.tar.xz | |
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
Diffstat (limited to 'var.c')
0 files changed, 0 insertions, 0 deletions