02-27-2012
Again, "what is diff for?" Do you really need an editor to do this?
There are other programs like diff which can be used more efficiently. I have been associated with Linux kernel development team for a short period of time (in my college days..3 years back) and they used to use diff as a base for all the patch management. We are talking about tens of thousands of lines of codes here!!
UNIX was meant for small but powerful "tools" rather than a software suite!! Together these tools could do virtually everything. It all depends how familiar and capable you are to take advantage of the tools!
10 More Discussions You Might Find Interesting
1. Shell Programming and Scripting
Hello everybody,
My question is: how to add /tmp/work at the end of line in vi editor.
my file looks like:
cp file1
cp file2
cp file3
****
I need to add " /tmp/work" at the end of each line.
I tried this
:%s/$/" /tmp/work"
and this
:%s/$/\ /tmp/work\/
but it does not work. (2 Replies)
Discussion started by: billy5
2 Replies
2. HP-UX
I'd like to find some editor for HP-UX, something like notepad, but not VI editor. Can someone have some ideas which one?
thx (6 Replies)
Discussion started by: diamond
6 Replies
3. UNIX for Advanced & Expert Users
Hi,
how can I add at the begining and at the end of all of the lines of my text file in VI editor ? Many thanks before.
for exemple if in my file i have
line 1
line 2
I want to have :
start line 1 end
start line 2 end (3 Replies)
Discussion started by: alain123456
3 Replies
4. UNIX Desktop Questions & Answers
We work on AIX 5L
We use vi as text editor (only scripts to create and modifiy).
What do you think of emacs ? Where can I find it ?
Do you know better text editor for scripts ?
Thank you for all answers. (1 Reply)
Discussion started by: annemar
1 Replies
5. HP-UX
I am new in hp ux and I want work with vi editor, but in hp ux vi editor the backspaes and del keys doesn't work.
how can I enable them.
thanks (3 Replies)
Discussion started by: hkoolivand
3 Replies
6. UNIX for Dummies Questions & Answers
Hi,
I knw its a silly question, but am a newbie to 'vi' editor. I'm forced to use this, hence kindly help me with this question.
How can i paste a chunk 'copied from' a different editor(gedit) in 'vi editor'?
As i see, p & P options does work only within 'vi'. (10 Replies)
Discussion started by: harishmitty
10 Replies
7. Shell Programming and Scripting
Hi All,
I am running a script , working very fine on cmd prompt. The problem is that when I open do crontab -e even after setting editor to vi by
set EDITOR=vi it does not open a vi editor , rather it do as below.....
/////////////////////////////////////////////////////
$ set... (6 Replies)
Discussion started by: aarora_98
6 Replies
8. Solaris
Epic Editor was not able to obtain a license for your use. Feature Epic Editor :License server is down (1 Reply)
Discussion started by: durgaprasadr13
1 Replies
9. Shell Programming and Scripting
How can ` character be printed on vi editor ?
empl_id=`echo $line | awk ' { print $1; } '` (2 Replies)
Discussion started by: senem
2 Replies
10. Shell Programming and Scripting
Hello All,
Need one Help for one issue.
I am using a French Keyboard, so @ sign is on key 0 and i have to use right Alt + 0 to print it.
It is working everywhere but not inside Vi editor. I can type @ in shell, in notepad. But inside Vi editor it is not working, another problem is that if... (2 Replies)
Discussion started by: yadavricky
2 Replies
LEARN ABOUT SUSE
git-difftool
GIT-DIFFTOOL(1) Git Manual GIT-DIFFTOOL(1)
NAME
git-difftool - Show changes using common diff tools
SYNOPSIS
git difftool [<options>] <commit>{0,2} [--] [<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.
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 merge tools are: kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
ecmerge, diffuse, opendiff, p4merge and araxis.
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. $BASE is provided for compatibility with custom merge tool commands and has the same value as $LOCAL.
-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.
-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
AUTHOR
Written by David Aguilar <davvid@gmail.com[1]>.
DOCUMENTATION
Documentation by David Aguilar and the git-list <git@vger.kernel.org[2]>.
GIT
Part of the git(1) suite
NOTES
1. davvid@gmail.com
mailto:davvid@gmail.com
2. git@vger.kernel.org
mailto:git@vger.kernel.org
Git 1.7.1 07/05/2010 GIT-DIFFTOOL(1)