]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'mm/push-default-switch-warning'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Aug 2012 18:54:04 +0000 (11:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Aug 2012 18:54:04 +0000 (11:54 -0700)
In the next major release, we will switch "git push [$there]" that
does not say what to push from the traditional "matching" to the
updated "simple" semantics, that pushes the current branch to the
branch with the same name only when the current branch is set to
integrate with that remote branch (all other cases will error out).

* mm/push-default-switch-warning:
  push: start warning upcoming default change for push.default

1  2 
builtin/push.c
t/t5541-http-push.sh

diff --cc builtin/push.c
Simple merge
Simple merge