Add git difftool support (keybinding <c-t>) #1846
Closed
Conversation
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
Ryooooooga
reviewed
Mar 30, 2022
|
|
||
| cmdStr := "git difftool --submodule " | ||
|
|
||
| file := gui.currentlySelectedFilename() |
There was a problem hiding this comment.
Suggested change
| file := gui.currentlySelectedFilename() | |
| file := gui.currentlySelectedFilename() | |
| if file == "" { | |
| file = gui.getSelectedPath() | |
| } | |
for Staged/Unstaged Changes panel
Ryooooooga
reviewed
Mar 30, 2022
| } | ||
|
|
||
| if file != "" { | ||
| cmdStr += " -- " + file |
There was a problem hiding this comment.
Suggested change
| cmdStr += " -- " + file | |
| cmdStr += " -- " + gui.os.Quote(file) |
mark2185
reviewed
Jul 6, 2022
| @@ -953,6 +954,7 @@ func EnglishTranslationSet() TranslationSet { | |||
| DiffingMenuTitle: "Diffing", | |||
| LcSwapDiff: "reverse diff direction", | |||
| LcOpenDiffingMenu: "open diff menu", | |||
| LcLaunchDiffTool: "Launch git difftool", | |||
There was a problem hiding this comment.
Lc in LcSomeTitle actually denotes lowercase, could you change it to launch git difftool then?
zeevro
force-pushed
the
git-difftool-support
branch
from
5db6b6d to
4686571
Compare
|
Hello there! Any updates with this PR? |
jesseduffield
requested changes
Sep 24, 2022
There was a problem hiding this comment.
Marking as changes requested for my own bookkeeping. Let me know if you need any guidance with this @zeevro
|
This is superseded by #3156. Closing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I've added the ability to launch
git difftoolfor what's currently in the diff screen.