summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-31 14:58:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-31 14:58:38 -0700
commitcf8a8c6bd53c43e29cb735eb7934ffc996475d77 (patch)
treea50e887cc7bed478902004e88322f2542f3d16a5 /builtin/fmt-merge-msg.c
parentSync with maint (diff)
parentGit 2.3.5 (diff)
downloadtgif-cf8a8c6bd53c43e29cb735eb7934ffc996475d77.tar.xz
Sync with 2.3.5
* maint: Git 2.3.5 docs: clarify what git-rebase's "-p" / "--preserve-merges" does
Diffstat (limited to 'builtin/fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions