summaryrefslogtreecommitdiffstats
path: root/builtin-merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-26 23:03:17 +0100
committerJunio C Hamano <gitster@pobox.com>2009-12-26 23:03:17 +0100
commit7ad9cec81d86ccf7a693ad7e1218e238aee5ca9d (patch)
treecd2824a4db13560c32edea6e979931fbbcd9ddac /builtin-merge-recursive.c
parentMerge branch 'jc/1.7.0-send-email-no-thread-default' (diff)
parentRefuse deleting the current branch via push (diff)
downloadgit-7ad9cec81d86ccf7a693ad7e1218e238aee5ca9d.tar.xz
git-7ad9cec81d86ccf7a693ad7e1218e238aee5ca9d.zip
Merge branch 'jc/1.7.0-push-safety'
* jc/1.7.0-push-safety: Refuse deleting the current branch via push Refuse updating the current branch in a non-bare repository via push
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions