aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-26 10:51:18 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-26 10:51:18 -0700
commit731673b15ee886989afe57e50450e8ad9ed9dea3 (patch)
tree859ab5aa0cac18c01986180bd5cf0237c7476e34 /cache.h
parent5d65c2ee88e09462a9fe11e7d739bc19bb8a3780 (diff)
parent135dadef712f0c4cf884940e751024c831937904 (diff)
downloadgit-731673b15ee886989afe57e50450e8ad9ed9dea3.tar.gz
git-731673b15ee886989afe57e50450e8ad9ed9dea3.tar.xz
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
Diffstat (limited to 'cache.h')
0 files changed, 0 insertions, 0 deletions