05-02-2012
Okay, sounds reasonable enough. Working on something.
10 More Discussions You Might Find Interesting
1. Shell Programming and Scripting
Can anybody help me out with this problem
" a shell program that takes one or any number of file names as input; sorts the lines of each file in ascending order and displays the non blank lines of each sorted file and merge them as one combined sorted file. The program generates an error... (1 Reply)
Discussion started by: arya
1 Replies
2. Shell Programming and Scripting
Hi
I want to merge two or more files using perl in windows only(Just like Paste command in Unix script) . How can i do this.Is ther any single command to do this?
Thanks
Kunal (1 Reply)
Discussion started by: kunal_dixit
1 Replies
3. Shell Programming and Scripting
Hello,
I have two txt files that look like this:
db.0.0.0.0:
Total number of NS records = 1
db.127.0.0.0:
Total number of NS records = 1
Total number of PTR records = 1
db.172.19.0.0:
Total number of NS records = 1
Total number of PTR records = 3
db.172.19.59.0:
Total... (8 Replies)
Discussion started by: richsark
8 Replies
4. Shell Programming and Scripting
Hi,
I have a very basic knowledge of shell scripting & would like some help with a little problem I have. I sometimes use a program calle phronix & sometimes like to compare its results which are *.xml files. Which is easy enough but a friend wants to avoid typing the path to the files.... (2 Replies)
Discussion started by: ptrbee
2 Replies
5. Shell Programming and Scripting
Hi all,
I hope you can help me.
I got a file a and a file b
File a contains
a
b
c
d
e
f
g
h
File b contains
1
2
3 (8 Replies)
Discussion started by: stinkefisch
8 Replies
6. Shell Programming and Scripting
Dear all,
I am new to this community. I need a script that will merge two lines of a text file based on some character. for example-
Input
asfdas fas sdfhksd sdf ss 45 gf#
gjsdh fhjsd yiu oiuio ioioiuii
sdgjdshsdg sdhfjk
sdfhsd sdf sdf sdf wer wer we#
qqwewq qwe qwe wer#
fsdf sdf... (8 Replies)
Discussion started by: wildhorse
8 Replies
7. Shell Programming and Scripting
I have a file test.log
The content of the file is :
a:R_yz:1
a:R_cd:2
a:F_bc:0
a:F_xx:3
b:R_dg:5
b:R_gf:1
b:F_fd:4
I want the output is :
:a R_yz 1 3 3
: R_cd 2
: F_bc 0
: F_xx 3
:b R_dg 5 6 4
: R_gf 1
: F_fd 4 (8 Replies)
Discussion started by: mnmonu
8 Replies
8. Shell Programming and Scripting
I have a need to merge two files on the value of an index column.
input file 1
id filePath MDL_NUMBER
1 MFCD00008104.mol MFCD00008104
2 MFCD00012849.mol MFCD00012849
3 MFCD00037597.mol MFCD00037597
4 MFCD00064558.mol MFCD00064558
5 MFCD00064559.mol MFCD00064559
input file 2
... (9 Replies)
Discussion started by: LMHmedchem
9 Replies
9. Shell Programming and Scripting
Hi I have two scripts one is Expect and other is shell.
I want to merge Expect code in to Shell script so that i can run it using only one script. Can somebody help me out ?
Order to execute: Run Expect_install.sh first and then when installation completes run runTests.sh shell script.
... (1 Reply)
Discussion started by: ashish_neekhra
1 Replies
10. Shell Programming and Scripting
POLY_STATS
{
EqName 103_tri
Id 123
act_polyCount 1
act_polyValue 0
}
POLY_STATS
{
EqName 103_tri
Id 123
pass_polyCount 2
pass_polyValue 0
}
POLY_STATS
{
EqName 103
Id 123
mes_polyCount 2
mes_polyValue 0 (5 Replies)
Discussion started by: Jag02
5 Replies
LEARN ABOUT DEBIAN
git-merge-base
GIT-MERGE-BASE(1) Git Manual GIT-MERGE-BASE(1)
NAME
git-merge-base - Find as good common ancestors as possible for a merge
SYNOPSIS
git merge-base [-a|--all] <commit> <commit>...
git merge-base [-a|--all] --octopus <commit>...
git merge-base --independent <commit>...
DESCRIPTION
git merge-base finds best common ancestor(s) between two commits to use in a three-way merge. One common ancestor is better than another
common ancestor if the latter is an ancestor of the former. A common ancestor that does not have any better common ancestor is a best
common ancestor, i.e. a merge base. Note that there can be more than one merge base for a pair of commits.
OPERATION MODE
As the most common special case, specifying only two commits on the command line means computing the merge base between the given two
commits.
More generally, among the two commits to compute the merge base from, one is specified by the first commit argument on the command line;
the other commit is a (possibly hypothetical) commit that is a merge across all the remaining commits on the command line.
As a consequence, the merge base is not necessarily contained in each of the commit arguments if more than two commits are specified. This
is different from git-show-branch(1) when used with the --merge-base option.
--octopus
Compute the best common ancestors of all supplied commits, in preparation for an n-way merge. This mimics the behavior of git
show-branch --merge-base.
--independent
Instead of printing merge bases, print a minimal subset of the supplied commits with the same ancestors. In other words, among the
commits given, list those which cannot be reached from any other. This mimics the behavior of git show-branch --independent.
OPTIONS
-a, --all
Output all merge bases for the commits, instead of just one.
DISCUSSION
Given two commits A and B, git merge-base A B will output a commit which is reachable from both A and B through the parent relationship.
For example, with this topology:
o---o---o---B
/
---o---1---o---o---o---A
the merge base between A and B is 1.
Given three commits A, B and C, git merge-base A B C will compute the merge base between A and a hypothetical commit M, which is a merge
between B and C. For example, with this topology:
o---o---o---o---C
/
/ o---o---o---B
/ /
---2---1---o---o---o---A
the result of git merge-base A B C is 1. This is because the equivalent topology with a merge commit M between B and C is:
o---o---o---o---o
/
/ o---o---o---o---M
/ /
---2---1---o---o---o---A
and the result of git merge-base A M is 1. Commit 2 is also a common ancestor between A and M, but 1 is a better common ancestor, because 2
is an ancestor of 1. Hence, 2 is not a merge base.
The result of git merge-base --octopus A B C is 2, because 2 is the best common ancestor of all commits.
When the history involves criss-cross merges, there can be more than one best common ancestor for two commits. For example, with this
topology:
---1---o---A
/
X
/
---2---o---o---B
both 1 and 2 are merge-bases of A and B. Neither one is better than the other (both are best merge bases). When the --all option is not
given, it is unspecified which best one is output.
SEE ALSO
git-rev-list(1), git-show-branch(1), git-merge(1)
GIT
Part of the git(1) suite
Git 1.7.10.4 11/24/2012 GIT-MERGE-BASE(1)