Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

git difftool holding the shell

I'm using git bash for Windows with Beyond & Compare as my difftool (but the same thing occures with any external difftool).

I would like my terminal not to be waiting for the difftool to exit in order to give terminal control back. It would be useful for me to keep the difftool session opened while performing other git tasks in the command line.

Is it possible ?

I don't know if this has anything to do with trustexistcode but this setting won't change anything to the terminal behavior I'm looking for.

like image 682
Sbu Avatar asked Sep 23 '16 04:09

Sbu


People also ask

How does git Difftool work?

git difftool is a Git command that allows you to compare and edit files between revisions using common diff tools. git difftool is a frontend to git diff and accepts the same options and arguments.

How do I run git Difftool?

Usage. Run Git Difftool: Diff File from the Command Palette or use ⌥⌃D to diff the currently open file. Run Git Difftool: Diff Project from the Command Palette or use ⌃⇧D to diff the whole project.

What is the command to turn off diff tool prompting?

man git-difftool OPTIONS -y, --no-prompt Do not prompt before launching a diff tool.

What is the default git diff tool?

The default Diff Tool is vimdiff. Specifying a Diff Tool affects the git difftool command. The command git diff still performs diffing on the command-line.


1 Answers

At the time I asked the question I didn't know I could simply exit the handle (which is only waiting for the external tool to emit its exit code), using Ctrl + C.

This is not automatic but it is enough to get going.

EDIT - better solution : as suggested in @1615903's comment, putting an & after the difftool command seems to be launching the difftool without any handle.

like image 95
Sbu Avatar answered Oct 28 '22 14:10

Sbu