summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-08 21:35:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-08 21:35:53 -0700
commitf34d900aa7346592a9d7fd2eb7b21126fd9732d5 (patch)
treebf756b15988b94b1f045a6f53c1eec9c3c479812 /diff.h
parentMerge branch 'jk/reflog-date' into maint (diff)
parentt5533: make it pass on case-sensitive filesystems (diff)
downloadtgif-f34d900aa7346592a9d7fd2eb7b21126fd9732d5.tar.xz
Merge branch 'jk/push-force-with-lease-creation' into maint
"git push --force-with-lease" already had enough logic to allow ensuring that such a push results in creation of a ref (i.e. the receiving end did not have another push from sideways that would be discarded by our force-pushing), but didn't expose this possibility to the users. It does so now. * jk/push-force-with-lease-creation: t5533: make it pass on case-sensitive filesystems push: allow pushing new branches with --force-with-lease push: add shorthand for --force-with-lease branch creation Documentation/git-push: fix placeholder formatting
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions