12-27-2012
Pls be more specific, post an example of your constellation, where to find the header, and rules how to merge the files (e.g. specially ordered, by contents, no order).
10 More Discussions You Might Find Interesting
1. Shell Programming and Scripting
Hi Gurus,
I am new to unix and need your help to make a shell script. I have a requirement, would appreciate if you could please help me on it:
Requirement:
-------------
I will pass 2 parameters in shell script 1). Directory name say errors 2). file extension say .log
First of all this... (4 Replies)
Discussion started by: anshulinpc
4 Replies
2. Shell Programming and Scripting
foreach file ($dir1/*)
if ($file ~ *.txt) then
echo "Skipping $file (is a txt file)"
endif
end
that should work right guys? :confused: (15 Replies)
Discussion started by: pantelis
15 Replies
3. Solaris
I had mount from server A to server B. I am able to access the files present under server B. I can create new files on server B, but i am not able to edit the files which are already present. When i saw the permissions on those files it is 777.
can some one tell me why i am not able to edit... (2 Replies)
Discussion started by: subbaraju
2 Replies
4. Solaris
# ls -l
total 10
-rw-r--r-- 1 dummy2 other 140 Jun 19 21:37 local.cshrc
-rw-r--r-- 1 dummy2 other 136 Jun 19 21:37 local.cshrc~
-rw-r--r-- 1 dummy2 other 157 Jun 19 21:37 local.login
-rw-r--r-- 1 dummy2 other 178 Jun 19 21:37 local.profile... (6 Replies)
Discussion started by: chidori
6 Replies
5. Shell Programming and Scripting
Hi all,
I am looking for a script which renames all the files from the present directory.
Eg.:
In unix directory contains the below files
linux001.txt
linux002.txt
linux003.txt
......
.......
Now the files should be renamed to
unix001.txt
unix002.txt
unix003.txt
Could anyone... (8 Replies)
Discussion started by: scriptscript
8 Replies
6. UNIX for Dummies Questions & Answers
Hi
I am unable to find files, those are present anywhere in the same directory tree, based on the creation date. I need to find the files with their path, as I need to create them in another location and move them. I need some help with a script that may do the job.
Please help (2 Replies)
Discussion started by: sam192837465
2 Replies
7. Shell Programming and Scripting
Hi frnds,
My requirement is I have a zip file with name say eg: test_ABC_UH_ccde2a_awdeaea_20150422.zip
within that there are subdirectories on each directory we again have .zip files and in that we have files like mama20150422.gz and so on.
Iam in need of a bash script so that it unzips... (0 Replies)
Discussion started by: Ravi Kishore
0 Replies
8. Shell Programming and Scripting
Hey Guys,
I want to merge all files (Apache Tomcat Access Logs) for a particular date say "Aug 24" to be merged into a single file.
Is there any quick hack for that ?
$ ls -alrth access_log2016-08-*|grep "Aug 24"
-rw-rw-r--. 1 tomcat tomcat 16M Aug 24 00:00... (8 Replies)
Discussion started by: bluemind2005
8 Replies
9. Shell Programming and Scripting
Hello,
I have 40 data files where the first three columns are the same (in theory) and the 4th column is different. Here is an example of three files,
file 2: A_f0_r179_pred.txt
Id Group Name E0
1 V N(,)'1 0.2904
2 V N(,)'2 0.3180
3 V N(,)'3 0.3277
4 V N(,)'4 0.3675
5 V N(,)'5 0.3456
... (8 Replies)
Discussion started by: LMHmedchem
8 Replies
10. Shell Programming and Scripting
Hello Folks,
Looking for a script which can keep doing ls to the directories and once file landed to the directory then ,read the files do further calculation and exit.
Kindly guide.
Regards,
Sadique (3 Replies)
Discussion started by: sadique.manzar
3 Replies
LEARN ABOUT MOJAVE
git-mergetool
GIT-MERGETOOL(1) Git Manual GIT-MERGETOOL(1)
NAME
git-mergetool - Run merge conflict resolution tools to resolve merge conflicts
SYNOPSIS
git mergetool [--tool=<tool>] [-y | --[no-]prompt] [<file>...]
DESCRIPTION
Use git mergetool to run one of several merge utilities to resolve merge conflicts. It is typically run after git merge.
If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file (skipping those without
conflicts). Specifying a directory will include all unresolved files in that path. If no <file> names are specified, git mergetool will run
the merge tool program on every file with merge conflicts.
OPTIONS
-t <tool>, --tool=<tool>
Use the merge resolution program specified by <tool>. Valid values include emerge, gvimdiff, kdiff3, meld, vimdiff, and tortoisemerge.
Run git mergetool --tool-help for the list of valid <tool> settings.
If a merge resolution program is not specified, git mergetool will use the configuration variable merge.tool. If the configuration
variable merge.tool is not set, git mergetool will pick a suitable default.
You can explicitly provide a full path to the tool by setting the configuration variable mergetool.<tool>.path. For example, you can
configure the absolute path to kdiff3 by setting mergetool.kdiff3.path. Otherwise, git mergetool assumes the tool is available in PATH.
Instead of running one of the known merge tool programs, git mergetool can be customized to run an alternative program by specifying
the command line to invoke in a configuration variable mergetool.<tool>.cmd.
When git mergetool is invoked with this tool (either through the -t or --tool option or the merge.tool configuration variable) the
configured command line will be invoked with $BASE set to the name of a temporary file containing the common base for the merge, if
available; $LOCAL set to the name of a temporary file containing the contents of the file on the current branch; $REMOTE set to the
name of a temporary file containing the contents of the file to be merged, and $MERGED set to the name of the file to which the merge
tool should write the result of the merge resolution.
If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable
mergetool.<tool>.trustExitCode can be set to true. Otherwise, git mergetool will prompt the user to indicate the success of the
resolution after the custom tool has exited.
--tool-help
Print a list of merge tools that may be used with --tool.
-y, --no-prompt
Don't prompt before each invocation of the merge resolution program. This is the default if the merge resolution program is explicitly
specified with the --tool option or with the merge.tool configuration variable.
--prompt
Prompt before each invocation of the merge resolution program to give the user a chance to skip the path.
-O<orderfile>
Process files in the order specified in the <orderfile>, which has one shell glob pattern per line. This overrides the diff.orderFile
configuration variable (see git-config(1)). To cancel diff.orderFile, use -O/dev/null.
TEMPORARY FILES
git mergetool creates *.orig backup files while resolving merges. These are safe to remove once a file has been merged and its git
mergetool session has completed.
Setting the mergetool.keepBackup configuration variable to false causes git mergetool to automatically remove the backup as files are
successfully merged.
GIT
Part of the git(1) suite
Git 2.17.1 10/05/2018 GIT-MERGETOOL(1)