ivuorinen/cheatsheet-tldr
1
0
Fork 0
mirror of https://github.com/ivuorinen/cheatsheet-tldr.git synced 2026-02-27 11:53:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update cheatsheets

Browse Source
This commit is contained in:
ivuorinen
2025-05-06 00:19:54 +00:00
parent e452860d9b
commit 7e39fb6df5
49 changed files with 132 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tldr/git-mergetool
View File

@@ -18,15 +18,15 @@ source: https://github.com/tldr-pages/tldr.git
- Launch the merge tool identified by a name:
`git mergetool --tool {{tool_name}}`
`git mergetool {{[-t|--tool]}} {{tool_name}}`
- Don't prompt before each invocation of the merge tool:
`git mergetool --no-prompt`
`git mergetool {{[-y|--no-prompt]}}`
- Explicitly use the GUI merge tool (see the `merge.guitool` configuration variable):
`git mergetool --gui`
`git mergetool {{[-g|--gui]}}`
- Explicitly use the regular merge tool (see the `merge.tool` configuration variable):