projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5d65c2e 135dade)
Merge branch 'jc/push-upstream-sanity' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:51:18 +0000 (10:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:51:18 +0000 (10:51 -0700)
commit731673b15ee886989afe57e50450e8ad9ed9dea3
tree859ab5aa0cac18c01986180bd5cf0237c7476e34tree | snapshot
parent5d65c2ee88e09462a9fe11e7d739bc19bb8a3780commit | diff
parent135dadef712f0c4cf884940e751024c831937904commit | diff
Merge branch 'jc/push-upstream-sanity' into maint

The 'push to upstream' implementation was broken in some corner
cases. "git push $there" without refspec, when the current branch is
set to push to a remote different from $there, used to push to $there
using the upstream information to a remote unreleated to $there.

* jc/push-upstream-sanity:
  push: error out when the "upstream" semantics does not make sense
Git—the stupid content tracker