Merge branch 'jc/push-refmap'
authorJunio C Hamano <gitster@pobox.com>
Fri, 27 Dec 2013 22:57:50 +0000 (14:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Dec 2013 22:57:50 +0000 (14:57 -0800)
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

1  2 
builtin/push.c
remote.c
remote.h
diff --cc builtin/push.c
Simple merge
diff --cc remote.c
Simple merge
diff --cc remote.h
Simple merge