8 More Discussions You Might Find Interesting
1. UNIX for Beginners Questions & Answers
Greeting All
Diag tool HDD clone SCO 5 + Oracle 7 DB ( IBM T30 )
I am new to this forum and my knowledge on computers OS is average .
I have just acquired a factory diag tool for BMW/RR/MINI from a retired mechanic. Its runs on a IBM T30 laptop with a Unix/Oracle DB system. Sco 5... (8 Replies)
Discussion started by: bmw635
8 Replies
2. Cybersecurity
Hi guys,
I am working on designing a security system. I need a simulation tool that I can use to generate packets, testing the performance of my firewall, and get results. I already wrote the required coding using C++ language.
I found many general network simulation tools such as OPNet... (0 Replies)
Discussion started by: PhD Student
0 Replies
3. UNIX for Dummies Questions & Answers
Hi all,
Any one know about the chronicle tool. I came to know which is a scheduler tool. If u know any links regarding this please let me know.
Regards
Saravan (3 Replies)
Discussion started by: saravanakumar
3 Replies
4. Solaris
Hi All,
I have come through this very nice tool which stores the week performance stats in solaris, but its only stores the stats for 8 in the morning to 5 in the evening. i want to extend the facility to work 24 hrs . Does anyone know how to do that?
Thanks in advance (1 Reply)
Discussion started by: azs0309
1 Replies
5. AIX
Hi All,
I have a p550 server with 4 proc. But when i run nmon analyzer in cpu_sum it show 5 processors cpu0 cpu1 cpu2 cpu3 cpu4. Why it is showing 5 processors. (6 Replies)
Discussion started by: vjm
6 Replies
6. What is on Your Mind?
Hi,
I hope I could make a thread that talks about SUVs. If not, you could delete this thread. Anyway, I'm trying to pick a SUV for my dad and sister. My dad likes Lexus GX470 and my sister likes BMW X5 3.0i. They asked me which one is better, good or popular the GX470 or the X5 3.0i. They don't... (4 Replies)
Discussion started by: royal
4 Replies
7. Solaris
Hi @all,
I have some SUN boxes running.
Now I'm looking for the tool "top".
Where can I find it?
As I could see it is not installed on sys boxes.
Thanx and regards
daemon (2 Replies)
Discussion started by: daemon
2 Replies
8. Shell Programming and Scripting
Hello,
I am new to korn shell scripting and I would appreciated if someone can help me get started with the following:
I have a text(registry) file which looks like:
1 SOFTWARE 0
4 Clusters 0
0 Application Server ... (4 Replies)
Discussion started by: yotoruja
4 Replies
GIT-DIFFTOOL(1) Git Manual GIT-DIFFTOOL(1)
NAME
git-difftool - Show changes using common diff tools
SYNOPSIS
git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]
DESCRIPTION
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. See git-diff(1).
OPTIONS
-d, --dir-diff
Copy the modified files to a temporary location and perform a directory diff on them. This mode never prompts before launching the diff
tool.
-y, --no-prompt
Do not prompt before launching a diff tool.
--prompt
Prompt before each invocation of the diff tool. This is the default behaviour; the option is provided to override any configuration
settings.
-t <tool>, --tool=<tool>
Use the diff tool specified by <tool>. Valid values include emerge, kompare, meld, and vimdiff. Run git difftool --tool-help for the
list of valid <tool> settings.
If a diff tool is not specified, git difftool will use the configuration variable diff.tool. If the configuration variable diff.tool is
not set, git difftool will pick a suitable default.
You can explicitly provide a full path to the tool by setting the configuration variable difftool.<tool>.path. For example, you can
configure the absolute path to kdiff3 by setting difftool.kdiff3.path. Otherwise, git difftool assumes the tool is available in PATH.
Instead of running one of the known diff tools, git difftool can be customized to run an alternative program by specifying the command
line to invoke in a configuration variable difftool.<tool>.cmd.
When git difftool is invoked with this tool (either through the -t or --tool option or the diff.tool configuration variable) the
configured command line will be invoked with the following variables available: $LOCAL is set to the name of the temporary file
containing the contents of the diff pre-image and $REMOTE is set to the name of the temporary file containing the contents of the diff
post-image. $MERGED is the name of the file which is being compared. $BASE is provided for compatibility with custom merge tool
commands and has the same value as $MERGED.
--tool-help
Print a list of diff tools that may be used with --tool.
--[no-]symlinks
git difftool's default behavior is create symlinks to the working tree when run in --dir-diff mode and the right-hand side of the
comparison yields the same content as the file in the working tree.
Specifying --no-symlinks instructs git difftool to create copies instead. --no-symlinks is the default on Windows.
-x <command>, --extcmd=<command>
Specify a custom command for viewing diffs. git-difftool ignores the configured defaults and runs $command $LOCAL $REMOTE when this
option is specified. Additionally, $BASE is set in the environment.
-g, --[no-]gui
When git-difftool is invoked with the -g or --gui option the default diff tool will be read from the configured diff.guitool variable
instead of diff.tool. The --no-gui option can be used to override this setting.
--[no-]trust-exit-code
git-difftool invokes a diff tool individually on each file. Errors reported by the diff tool are ignored by default. Use
--trust-exit-code to make git-difftool exit when an invoked diff tool returns a non-zero exit code.
git-difftool will forward the exit code of the invoked tool when --trust-exit-code is used.
See git-diff(1) for the full list of supported options.
CONFIG VARIABLES
git difftool falls back to git mergetool config variables when the difftool equivalents have not been defined.
diff.tool
The default diff tool to use.
diff.guitool
The default diff tool to use when --gui is specified.
difftool.<tool>.path
Override the path for the given tool. This is useful in case your tool is not in the PATH.
difftool.<tool>.cmd
Specify the command to invoke the specified diff tool.
See the --tool=<tool> option above for more details.
difftool.prompt
Prompt before each invocation of the diff tool.
difftool.trustExitCode
Exit difftool if the invoked diff tool returns a non-zero exit status.
See the --trust-exit-code option above for more details.
SEE ALSO
git-diff(1)
Show changes between commits, commit and working tree, etc
git-mergetool(1)
Run merge conflict resolution tools to resolve merge conflicts
git-config(1)
Get and set repository or global options
GIT
Part of the git(1) suite
Git 2.17.1 10/05/2018 GIT-DIFFTOOL(1)