summaryrefslogtreecommitdiff
path: root/Documentation/gitremote-helpers.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-09-11 15:00:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-11 15:00:56 -0700
commit8c731e9c8f92b138c31a0897321a2578ba9221e5 (patch)
tree5bfc849cc4fc3e8c2e93da64ecf627defc005a06 /Documentation/gitremote-helpers.txt
parentMerge branch 'tf/gitweb-ss-tweak' (diff)
parentrebase --preserve-merges: ignore "merge.log" config (diff)
downloadtgif-8c731e9c8f92b138c31a0897321a2578ba9221e5.tar.xz
Merge branch 'rt/rebase-p-no-merge-summary'
"git rebase -p" internally used the merge machinery, but when rebasing, there should not be a need for merge summary. * rt/rebase-p-no-merge-summary: rebase --preserve-merges: ignore "merge.log" config
Diffstat (limited to 'Documentation/gitremote-helpers.txt')
0 files changed, 0 insertions, 0 deletions