summaryrefslogtreecommitdiff
path: root/t/t3030-merge-recursive.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-10-14 15:32:20 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-10-17 11:26:20 -0700
commitb0ad11ea165e07308fc02a5091efbe2e2d22237c (patch)
treef5c94bd5fe1e1af1afc472c1123e3aa2f9ee70a0 /t/t3030-merge-recursive.sh
parentFix fetch/pull when run without --update-head-ok (diff)
downloadtgif-b0ad11ea165e07308fc02a5091efbe2e2d22237c.tar.xz
pull: allow "git pull origin $something:$current_branch" into an unborn branch
Some misguided documents floating on the Net suggest this sequence: mkdir newdir && cd newdir git init git remote add origin $url git pull origin master:master "git pull" has known about misguided "pull" that lets the underlying fetch update the current branch for a long time. It also has known about "git pull origin master" into a branch yet to be born. These two workarounds however were not aware of the existence of each other and did not work well together. This fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions