summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-12-27 14:57:50 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-12-27 14:57:50 -0800
commit7cdebd8a2039cb3ec717b880709ea6dfd824e3c4 (patch)
treef07fff24eb335bc59849625af60378a869f766a8 /Documentation/git-merge.txt
parentSync with 1.8.5.2 (diff)
parentpush: also use "upstream" mapping when pushing a single ref (diff)
downloadtgif-7cdebd8a2039cb3ec717b880709ea6dfd824e3c4.tar.xz
Merge branch 'jc/push-refmap'
Make "git push origin master" update the same ref that would be updated by our 'master' when "git push origin" (no refspecs) is run while the 'master' branch is checked out, which makes "git push" more symmetric to "git fetch" and more usable for the triangular workflow. * jc/push-refmap: push: also use "upstream" mapping when pushing a single ref push: use remote.$name.push as a refmap builtin/push.c: use strbuf instead of manual allocation
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions