chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 22c5392) | patch
d-m-{merge,debrebase}(7): Set 'merge' in gbp.conf
authorSean Whitton <spwhitton@spwhitton.name>
Wed, 24 Jul 2019 19:08:23 +0000 (20:08 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 2 Feb 2020 16:46:43 +0000 (16:46 +0000)
commit8f086237a8e78c4bd7d018f70818092eb27a5440
treeb696600e705f7faea4a606eeb7e6f91c03cba260tree | snapshot
parent22c53928460b993bddadb72e8fd51dd916e29cfccommit | diff
d-m-{merge,debrebase}(7): Set 'merge' in gbp.conf

This enables simplifying runes which are more frequently to be typed.

'merge-mode' no longer need be set since in the only case where the
manpages recommend allowing `gbp import-orig` to perform a merge, a
different merge mode is required (and specified in that rune).

This is part of #932954.

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-debrebase.7.pod diff | blob | history
dgit-maint-merge.7.pod diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.