summaryrefslogtreecommitdiff
path: root/Documentation/git-fmt-merge-msg.txt
diff options
context:
space:
mode:
authorLibravatar Kevin Daudt <me@ikke.info>2015-03-19 23:14:08 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-19 15:26:21 -0700
commitf88851c6376f0b2a4cf87c061a848e4ae4438e0a (patch)
treeea29f8f8bdc58aeeb3621673b309ee36f5204d90 /Documentation/git-fmt-merge-msg.txt
parentMerge branch 'maint-1.9' into maint-2.0 (diff)
downloadtgif-f88851c6376f0b2a4cf87c061a848e4ae4438e0a.tar.xz
rev-list: refuse --first-parent combined with --bisect
rev-list --bisect is used by git bisect, but never together with --first-parent. Because rev-list --bisect together with --first-parent is not handled currently, and even leads to segfaults, refuse to use both options together. Because this is not supported, it makes little sense to use git log --bisect --first parent either, because refs/heads/bad is not limited to the first parent chain. Helped-by: Junio C. Hamano <gitster@pobox.com> Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Kevin Daudt <me@ikke.info> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fmt-merge-msg.txt')
0 files changed, 0 insertions, 0 deletions