forked from tldr-pages/tldr
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
git-mergetool: add page (tldr-pages#3947)
- Loading branch information
Showing
1 changed file
with
28 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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` |