Skip to content

Commit

Permalink
git-mergetool: add page (tldr-pages#3947)
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrl authored Mar 30, 2020
1 parent f0e63b7 commit 8bd5a05
Showing 1 changed file with 28 additions and 0 deletions.
28 changes: 28 additions & 0 deletions pages/common/git-mergetool.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# 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 --tool {{tool_name}}`

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

`git mergetool --no-prompt`

- Explicitly use the GUI merge tool (see the `merge.guitool` config variable):

`git mergetool --gui`

- Explicitly use the regular merge tool (see the `merge.tool` config variable):

`git mergetool --no-gui`

0 comments on commit 8bd5a05

Please sign in to comment.