10 More Discussions You Might Find Interesting
1. Red Hat
I have 2 RHEL 5.9 system where customized applications are running.
These 2 servers are with in a network (LAN) with each other.One application in say Server 1 can talk to another application in server 2 and vice versa.
The applications are exchanging data among each other.
Recently I am... (0 Replies)
Discussion started by: Anjan Ganguly
0 Replies
2. Windows & DOS: Issues & Discussions
Hi All,
I wanted to run a small socket application written in C on windows.
The code was written for GNU/linux..the compiler on windows CodeBlocks complains about the sys headers.
is there an equivalent for windows ? (4 Replies)
Discussion started by: coolatt
4 Replies
3. Shell Programming and Scripting
forgive me if i am posting this question in wrong forum.
I have a rsync script that runs on one server for rsync with another server (both linux)
.
Now I want to get control of that script from my windows 7 machine. Means I want to run that script from my windows machine whenever i want... (1 Reply)
Discussion started by: HarryReid
1 Replies
4. Windows & DOS: Issues & Discussions
I have a .NET application that remotely starts, stops, and gets status of Windows services and scheduled tasks. I would like to add the capability of starting, stopping, and getting status of remote AIX applications also. Based on some preliminary research, one option may be to use 3rd party .NET... (0 Replies)
Discussion started by: auser1
0 Replies
5. UNIX for Dummies Questions & Answers
Hi Guys,
is there a way to send traffic coming from the source iface (eth0, eth1)? i need to test traffic that will come from both eth0 and eth1 from a Linux box.
Thanks,
Martin (0 Replies)
Discussion started by: mdap
0 Replies
6. Linux
What are the differences, advantages, and disadvantages? (1 Reply)
Discussion started by: Advice Pro
1 Replies
7. Linux
I'd like to know if it's possible to run Windows "inside" a Linux-like OS similar to how you can run Linux in Windows, rather than dual-booting them both. As I mentioned in an earlier post, I want to do some serious parallel computing which Windows isn't even capable of at the moment... But I'd... (6 Replies)
Discussion started by: heliotos
6 Replies
8. UNIX for Dummies Questions & Answers
Hi!
We are having problems with our unix servers (SunOS 5.9) that services for some of our applications are continuously going down. (this is more due to the applications installed than the UNIX OS).
What I am looking for is some kind of administrative tool where I can set what service to scan... (1 Reply)
Discussion started by: erinor
1 Replies
9. Linux
OK: apologies (well) in advance if this is as stupid a question as it gets.
I need to change the 'owner' on certain files and folders within my Linux web hosting account.
Unfortunately I use Windows XP and now need some kind of Windows application that can open a window within XP that lets me... (1 Reply)
Discussion started by: Boa Prinz
1 Replies
10. UNIX Desktop Questions & Answers
Hi
i need some help , i would like to run a GUI application on windows from unix
i dont need to see the gui just to activate it from remote .
it shoud be from CLI on the unix .
thanks
GUY (1 Reply)
Discussion started by: koreng
1 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, --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.
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.
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 1.8.3.1 06/10/2014 GIT-DIFFTOOL(1)