9 More Discussions You Might Find Interesting
1. UNIX for Beginners Questions & Answers
Hi Comrades,
I am interested if there is the global internet network I can find free access to the Linux or unix server to create the own account to have some practice.
Thanks a lot for your advice and comments.
BR,
Dembi (2 Replies)
Discussion started by: Dembi
2 Replies
2. Shell Programming and Scripting
I have two arrays and they look like this:
array=(`cat /local/mnt/*sys/*includes|grep -v NEW`)
array2=(`cat /tmp/*sys.z |grep -v NEW`)
I am trying to compare them but I need to use the diff -u command. I am not sure how to do this. I cannot just do diff -u ${array} ${array2}
I cannot... (4 Replies)
Discussion started by: newbie2010
4 Replies
3. BSD
Is freeBSD a good choice for new Unix machine? I want to get back into Unix / Linux. System would be used for light scripting and file server needs. Something with nice software or hardware raid support would be good. If it could support virtual machines, kind of like VMWare's ESX that would be... (5 Replies)
Discussion started by: grips03
5 Replies
4. Shell Programming and Scripting
HI All,
I am new to Unix shell scripts..
Could you please post the unix shell script for for the below request.,
There are two different tables(sample1, sample2) in different schemas(s_schema1, s_schema2).
Unix shell script to compare the columns of two different tables of two... (2 Replies)
Discussion started by: Rajkumar Gopal
2 Replies
5. Shell Programming and Scripting
I use du -sk command to find the size of the directory but when i use the result of 'du -sk' into if statement its throwing error.. Could u solve with this..? (14 Replies)
Discussion started by: shaal89
14 Replies
6. Shell Programming and Scripting
Hi
I've been trying various methods that I have found online with regards to comparing 2 files using the diff command. Nothing seems to work. The problem is that I'm not too familiar with the proper syntax. Can you please assist me. Here is my script:
#!/bin/bash
awk -F',' -v file1="$1"... (9 Replies)
Discussion started by: ladyAnne
9 Replies
7. Shell Programming and Scripting
Hi Everyone,
1.txt
00:01:01 asdf
00:33:33 1234
00:33:33 0987
00:33:33 12
00:33:33 444
2.txt
vvvv|ee
444|dd33|ee
dddd|ee
12|ee
3ciur|fdd
the output should be: (6 Replies)
Discussion started by: jimmy_y
6 Replies
8. UNIX for Dummies Questions & Answers
can some 1 tel me wat is difference between unix and linux. and from where i can download unix for free (5 Replies)
Discussion started by: rohansaurav
5 Replies
9. UNIX for Dummies Questions & Answers
Hi,
Does anybody know the cmd to compare two areas and print out the different files w/ path?
I tried cmp and diff and dircmp but with no luck.
Should I grep and print?
For example:
/aa/images/jan
..../images/feb
/bb/images/jan
..../images/feb
i want to print the compare,... (5 Replies)
Discussion started by: andylee80
5 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.5.3 01/14/2014 GIT-DIFFTOOL(1)