Quick question,
File A has one line (10 charachters), File B has one line (10 charachters).
how do a concat these two files together to produce a file (File C) that has the contents of Files A + B together onto one line of 20 Charachters
if I use:
cat FileA FileB > FileC
I get the... (5 Replies)
Hi,
I was a typical Windows guy. Like to do things just by clicking my mouse:cool:. I got a new job now...where they are big on unix.
I am trying to wet my fingures now with unix. Haven't taken the dive yet.
I am trying to find a solution for this problem.
Please help me with some... (4 Replies)
i have data files in different directories like /jadat
/cadat etcc... i have list of this directories in a file files.
content of files:
ja
ca
directories:
/jadat
/cadat
file in each of these directories
natt_trans_like.dat
i need to loop though each directory for a... (1 Reply)
Hi all,
I have a directory with many subdirectories each named like so: KOG0001, KOG0002, ...KOG9999.
Each of these subdirectories contain a variable number two kinds of files (nuc and prot) named like so: Capitella_sp_nuc_hits.fasta (nuc) and Capitella_sp_prot_hits.fasta (prot). The... (2 Replies)
Hi, sometimes one wants to edit files while still seeing output of earlier commands in terminal. I've found out that cat test && cat - >> test does the trick for displaying file content and adding lines but I believe I saw a much cooler command that was also able to erase lines from files. I cannot... (6 Replies)
I am concatenating txt-files using cat:
cat *.txt > file.dat
However, the same directory has the installation instructions included, which is also a txt file: install.txt
I currently have the install.txt file renamed to install._txt, but I prefer a solution using regular expressions.
Is there... (5 Replies)
I want to printing into two files under difference situation.
For example, file 1 name.txt
>gma-miR172a Glyma02g28845
>gma-miR1513a-3p Glyma02g15840
>gma-miR166a-5p Glyma02g15840
>gma-miR1530 Glyma02g15130
>gma-miR1507a Glyma02g01841
File 2 a.gff
Glyma01g07930 ... (4 Replies)
I am trying to cat 3 files. They all have the same name MFExtract.txt. But, they are in 3 seperate file names. Any idea how I could cat the 3 together. It's throwing me off figuring out a way because the names are the same. I was thinking just doing a 3 cat commands with the full path names and... (2 Replies)
I am new to Linux and I am trying to cat only N files in a folder. N is dynamically given number at runtime.
If I give N as 2 then cat only 2 files in the folder
and If I give N as 5 then cat only 5 files in the folder.
Is there any way to do that? (6 Replies)
Discussion started by: KMusunuru
6 Replies
LEARN ABOUT DEBIAN
git-merge-index
GIT-MERGE-INDEX(1) Git Manual GIT-MERGE-INDEX(1)NAME
git-merge-index - Run a merge for files needing merging
SYNOPSIS
git merge-index [-o] [-q] <merge-program> (-a | [--] <file>*)
DESCRIPTION
This looks up the <file>(s) in the index and, if there are any merge entries, passes the SHA1 hash for those files as arguments 1, 2, 3
(empty argument if no file), and <file> as argument 4. File modes for the three files are passed as arguments 5, 6 and 7.
OPTIONS --
Do not interpret any more arguments as options.
-a
Run merge against all files in the index that need merging.
-o
Instead of stopping at the first failed merge, do all of them in one shot - continue with merging even when previous merges returned
errors, and only return the error code after all the merges.
-q
Do not complain about a failed merge program (a merge program failure usually indicates conflicts during the merge). This is for
porcelains which might want to emit custom messages.
If git merge-index is called with multiple <file>s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit
code.
Typically this is run with a script calling git's imitation of the merge command from the RCS package.
A sample script called git merge-one-file is included in the distribution.
ALERT ALERT ALERT! The git "merge object order" is different from the RCS merge program merge object order. In the above ordering, the
original is first. But the argument order to the 3-way merge program merge is to have the original in the middle. Don't ask me why.
Examples:
torvalds@ppc970:~/merge-test> git merge-index cat MM
This is MM from the original tree. # original
This is modified MM in the branch A. # merge1
This is modified MM in the branch B. # merge2
This is modified MM in the branch B. # current contents
or
torvalds@ppc970:~/merge-test> git merge-index cat AA MM
cat: : No such file or directory
This is added AA in the branch A.
This is added AA in the branch B.
This is added AA in the branch B.
fatal: merge program failed
where the latter example shows how git merge-index will stop trying to merge once anything has returned an error (i.e., cat returned an
error for the AA file, because it didn't exist in the original, and thus git merge-index didn't even try to merge the MM thing).
GIT
Part of the git(1) suite
Git 1.7.10.4 11/24/2012 GIT-MERGE-INDEX(1)