gandp1:/global/dmz/bbssdpi/LIVE/dp1020> /tmp/support/perl_1 /global/dmz/bbssdpi/LIVE/dp1020/archive/DP-BR_124683000.xml | head
Too many arguments for open at /tmp/support/perl_1 line 3, near "]) "
Execution of /tmp/support/perl_1 aborted due to compilation errors.
I made a small change to a UNIX script. When I tried to run it I received the following message:
/bin/ksh: ^M: not found
/bin/ksh: ^M: not found
/bin/ksh: ^M: not found
As ^M is a non printing character, I don't know how to discover where it is missing. How can I correct thiis... (2 Replies)
Hello All,
I'm trying to parse through a file and display all the hidden characters, including all carriage and line returns. I usually use cat -v, but this doesn't display the carriage and line returns. Does anyone know how this can be done?
Thanks
Khoom (5 Replies)
Can anyone seem to know how to find out whether a UNIX text file has 'hidden' control characters?
Can I view them using 'vi' by some command line options?
If there are control characters in a text file which are invisible/hidden.. then how do I get rid of them?
Your intelletual answers are... (6 Replies)
Hello everybody.
Im really new in shell scripting. Im working with RedHat 4.
I have begin to do some scripts to test the posibilitys but Im fancing a disturbing problem.
some times the lines that I write add the return character or end-of-file ascii character to the command or argument tha... (2 Replies)
I know that cat -v will show me hidden characters in a file....
I for some reason seem to think that there's a bash command that will show me hidden characters in a variable in a script? Or am I just imagining it?
Thanks in advance (8 Replies)
I am completely new to perl programming. My father is helping me learn said programming language. However, I am stuck on one of the assignments he has given me, and I can't find very much help with it via google, either because I have a tiny attention span, or because I can be very very dense.
... (4 Replies)
Hello everyone.
When I copy some configuration settings string from MS_Word to putty from my personal pc to a remote machine, it appears that I copy some hidden symbols, which at first, cannot be seen and appear as hidden. Some java programs did not start, and after investigation I found that:
... (3 Replies)
Hello.
I use this command :
rsync -av --include=".*" --dry-run "$A_FULL_PATH_S" "$A_FULL_PATH_D"The data comes from the output of a find command.
And no full source directories are in use, only some files.
Source example... (2 Replies)
Hi. I'm getting the following hidden characters \uat the start of a string after I pass in variables from the command line. I only noticed this when I set -x in my KSH script. Can anybody tell me how this happens and how to remove them?
Many thanks.
+ STR=$'\uusername testuser1'
+ print... (12 Replies)
Discussion started by: user052009
12 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)