Skip to content
Snippets Groups Projects
  • liscju's avatar
    927c0d84
    rebase: fix warning about ignoring tool option on rebase continue (issue4698) · 927c0d84
    liscju authored
    Before this patch rebase --continue with specified --tool option outputs
    warnings "tool option will be ignored". It is false statement because
    in case of any merge conflicts it uses specified tool to resolve it.
    
    This patch makes this warning appears only when user specified --tool
    when running rebase --abort , in this case tool doesn't have any
    sense
    927c0d84
    History
    rebase: fix warning about ignoring tool option on rebase continue (issue4698)
    liscju authored
    Before this patch rebase --continue with specified --tool option outputs
    warnings "tool option will be ignored". It is false statement because
    in case of any merge conflicts it uses specified tool to resolve it.
    
    This patch makes this warning appears only when user specified --tool
    when running rebase --abort , in this case tool doesn't have any
    sense
test-rebase-parameters.t 8.32 KiB