summaryrefslogtreecommitdiff
path: root/mergetools/bc
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2020-02-15 21:36:34 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-02-16 15:40:42 -0800
commit52eb738d6b40bf8816727fcf7f39febc761ef0db (patch)
tree78f8a2baf0660a987b2fdc93665def51f44e5432 /mergetools/bc
parentrebase: move incompatibility checks between backend options a bit earlier (diff)
downloadtgif-52eb738d6b40bf8816727fcf7f39febc761ef0db.tar.xz
rebase: add an --am option
Currently, this option doesn't do anything except error out if any options requiring the interactive-backend are also passed. However, when we make the default backend configurable later in this series, this flag will provide a way to override the config setting. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/bc')
0 files changed, 0 insertions, 0 deletions