summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-27 18:54:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-27 18:54:04 (GMT)
commitb9148c37637347cea7b448b57caeb2c58fe64979 (patch)
tree7c56aa0659579c762f86fbc43ff2e7270b1170f5 /combine-diff.c
parentefa646213a7d65955fbf897f57139ec3737d62f8 (diff)
parentf2c2c90103eaff6f39a289c15b9dbc06efaaf2a8 (diff)
downloadgit-b9148c37637347cea7b448b57caeb2c58fe64979.zip
git-b9148c37637347cea7b448b57caeb2c58fe64979.tar.gz
git-b9148c37637347cea7b448b57caeb2c58fe64979.tar.bz2
Merge branch 'mm/push-default-switch-warning'
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
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions