Merge branch 'ps/push-delete-option'
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Jan 2016 23:16:53 +0000 (15:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Jan 2016 23:16:54 +0000 (15:16 -0800)
"branch --delete" has "branch -d" but "push --delete" does not.

* ps/push-delete-option:
push: add '-d' as shorthand for '--delete'
push: add '--delete' flag to synopsis

1  2 
Documentation/git-push.txt
builtin/push.c
Simple merge
diff --cc builtin/push.c
Simple merge