I'm trying to run meld on RHEL5, to diff 2 directories. I able to see the files in diff. But when I click on the file to view the diff, I get the below error. Anyway to resolve this?
Hi ,
I am trying for squirrelmail In Rhel 5 I have the Image of the DVD .But in that I can't Find the
squirrelmail-1.4.2-1.noarch.rpm
And i downloaded the same but it is not working .
can anyone can give any link to download the same for Rhel5.??
Thanks (1 Reply)
Hey friends Anyone tell me the best book for learning RHEL5 from basic to master including everything that we can do with microsoft windows and server.
Does anyone know any good institute for red hat linux server in delhi,india (1 Reply)
# uname -a
Linux rhel5srv 2.6.18-8.el5 #1 SMP Fri Jan 26 14:15:21 EST 2007 i686 i686 i386 GNU/Linux
# mount
....
/dev/mapper/OsImageVG-rhel5LV on /OSIMAGE/rhel5 type ext3 (rw)
/dev/mapper/OsImageVG-solaris10LV on /OSIMAGE/solaris10 type ext3 (rw)
/dev/hda on /mnt/cdrom type iso9660 (ro)
... (2 Replies)
morning all,
anyone has installed samba on redhat el 5 server? after installed service (smb service in) where to edit samba configurations?
as for the el4, on desktop in application --> system setting --> server setting -- > samba.
but in el5, in the server setting no such samba... (5 Replies)
Hi All,
I want to upgrade a VM server from RHEL5.4 to RHEL5.5.
My server is inside my office intranet and the yum.conf contents look like this:
cachedir=/var/cache/yum
keepcache=0
debuglevel=2
logfile=/var/log/yum.log
pkgpolicy=newest
distroverpkg=redhat-release
tolerant=1... (2 Replies)
Hi,
I am managing a Few Applications (like Apache,Jboss) running on RHEL 5.4.
I have just been notified that these servers need to be patched.
My question is ,will the configurations for Apache and Jboss and other applications get disturbed if the server is patched.?
If so what precautions... (5 Replies)
Hi,
I have Ubuntu 9.10 and I need to install "meld" for file comparison.
I did sudo apt-get install meld but the command is failing with this error:
404 Not Found
Failed to fetch 404 Not Found
E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?
... (1 Reply)
Hello,
WE currently have a RedHat5.4 server which we need to upgrade with latest patches. This runs database Oracle 11gR2.
If anyone can suggest if it is better to perform patches update or just migrate to a higher supported RHEL5.x version..
From what I know Oracle 11gR2 is supported by... (2 Replies)
Discussion started by: ikn3
2 Replies
LEARN ABOUT CENTOS
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 -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)