summaryrefslogtreecommitdiff
path: root/builtin/merge-base.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-31 14:52:23 -0700
committerJunio C Hamano <gitster@pobox.com>2015-03-31 14:52:24 -0700
commita78fc4af8246e06de4fc10f685a84778cf33aa12 (patch)
tree823387ba4ba96d3250edcc0e1a71ce6c2f3e68a5 /builtin/merge-base.c
parent2c97724d5ea59677b18b7a1cc50a250b6ff459e5 (diff)
parentfddfaf8a229710c50aeaacf6e40429965348493e (diff)
downloadgit-a78fc4af8246e06de4fc10f685a84778cf33aa12.tar.gz
Merge branch 'ph/push-doc-cas' into maint
* ph/push-doc-cas: git-push.txt: clean up force-with-lease wording
Diffstat (limited to 'builtin/merge-base.c')
0 files changed, 0 insertions, 0 deletions