lilith/tldr
1
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2025-06-08 19:46:00 +02:00
Code Activity
tldr/pages/common/git-mergetool.md
Managor 0e8893e1ba
git*: refresh pages (#16372) 
Co-authored-by: Juri Dispan <juri.dispan@posteo.net>
Co-authored-by: CleanMachine1 <78213164+CleanMachine1@users.noreply.github.com>
Co-authored-by: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>
2025-05-05 09:12:13 +03:00

696 B
Raw Blame History

git mergetool

Run merge conflict resolution tools to resolve merge conflicts. More information: https://git-scm.com/docs/git-mergetool.

  • Launch the default merge tool to resolve conflicts:

git mergetool

  • List valid merge tools:

git mergetool --tool-help

  • Launch the merge tool identified by a name:

git mergetool {{[-t|--tool]}} {{tool_name}}

  • Don't prompt before each invocation of the merge tool:

git mergetool {{[-y|--no-prompt]}}

  • Explicitly use the GUI merge tool (see the merge.guitool configuration variable):

git mergetool {{[-g|--gui]}}

  • Explicitly use the regular merge tool (see the merge.tool configuration variable):

git mergetool --no-gui