summaryrefslogtreecommitdiff
path: root/builtin/describe.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-04-26 10:51:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-26 10:51:18 -0700
commit731673b15ee886989afe57e50450e8ad9ed9dea3 (patch)
tree859ab5aa0cac18c01986180bd5cf0237c7476e34 /builtin/describe.c
parentMerge branch 'jc/maint-clean-nested-worktree-in-subdir' into maint (diff)
parentpush: error out when the "upstream" semantics does not make sense (diff)
downloadtgif-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 'builtin/describe.c')
0 files changed, 0 insertions, 0 deletions