02-09-2002
Check to see if you have "Xconfigurator", or "xconfigurator".
If not, there are other options, but as far as I know, that tool is very simple to use.
10 More Discussions You Might Find Interesting
1. UNIX for Advanced & Expert Users
We have 2 Unix boxes.
AIX 4.3 RS/6000
Linux RedHat 6.1 Intel
There is a name server running on the linux machine. This is not used on the AIX machine ( it simply uses /etc/hosts ).
Now i have rsh permission denied problems and i suspect our AIX and tcp/ip name resolution.
I was told to... (2 Replies)
Discussion started by: progressdll
2 Replies
2. UNIX for Advanced & Expert Users
My machine (Sun Blade 100) has just had it's OS reinstalled (solaris 8). For some reason the monitor resolution has changed (decreaded so that I have less monitor real esate).
Does anybody know the command to change monitor resolution in Solaris?
Cheers
AreaMan (2 Replies)
Discussion started by: AreaMan
2 Replies
3. UNIX for Advanced & Expert Users
Guys,
We are going to order the wide screen monitor with 1920*1200 resolution for one U60 in our client side, that their current graphic card is Elite3D-m6 and the higher resolution which this card supports is 1280*1024.
I just want to make sure wehther we are able to work with this monitor via... (1 Reply)
Discussion started by: nikk
1 Replies
4. Solaris
Hi,
I got solaris 10 installed on a E250 and i am expericing issues resolving dns.
from some research i think it's becuase where i haven't set-up NIS and i don't intend too as i am just setting up a box to poke communigate pro.
Any help or advice please?
Thanks in advance
Alan (1 Reply)
Discussion started by: e250user
1 Replies
5. IP Networking
I have an AIX4.3 box on our subnet, called LIMEST3.OURDOMAIN.CO.UK, with IP address 10.103.1.13
It has the following entry in its own /etc/hosts:
10.103.1.13 limest3 limest3.ourdomain.co.uk
Now, if I ping limest3.ourdomain.co.uk or ping 10.103.1.13, the result is instant. However if I ping... (4 Replies)
Discussion started by: grimbleshanks
4 Replies
6. Solaris
Hi friends, i had small problem in my home pc i install solaris 10 but GUI is very big cannot view any thing, but i can open terminal where with very difficulty is there any command to re size my resolution some thing like 1024. if not i want to log in default console other than GUI only terminal... (5 Replies)
Discussion started by: kurva
5 Replies
7. Solaris
how to change screen resolution in CDE prompt (2 Replies)
Discussion started by: tirupathi
2 Replies
8. Red Hat
hi all
after going through ext3 file system , i understood that data resolution for ext3 FS is 1 second...can i increase it 2 second...? any idea..? (3 Replies)
Discussion started by: sagar_md
3 Replies
9. Solaris
Hi all. I have a very peculiar problem in Solaris 10. The output of the m64config -prconf command with regards the Card Adapter is the following.
Card possible resolutions: 720x400x85, 640x480x60, 640x480x72, 640x480x75
800x600x56, 800x600x60, 800x600x72, 800x600x75, 1024x768x60
... (0 Replies)
Discussion started by: lynxman
0 Replies
10. Windows & DOS: Issues & Discussions
Hello guys,
At windows 7, when multiple ip addresses used on one nic, starting "network" from desktop is able to resolve samba machine's name (freebsd + samba3.5.9 from ports) but does not want to open machine (error: unexisting) nor ping it by name. Works fine if specified by ipv4/ipv6 address... (2 Replies)
Discussion started by: hachik
2 Replies
LEARN ABOUT DEBIAN
git-difftool
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
-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 diff tools are: araxis, bc3, deltawalker, diffuse, emerge, ecmerge, gvimdiff, kdiff3,
kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.
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.
-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.7.10.4 11/24/2012 GIT-DIFFTOOL(1)