10-25-2003
10 More Discussions You Might Find Interesting
1. Shell Programming and Scripting
Is it possible to redirect standard output to two locations? Unfortunately, I need to redirect it to two different files. Or if there might be any utilities that can do it.
I'm suspecting not as it's all pipes and filters, but thought I'd ask. (2 Replies)
Discussion started by: GaryRudolph
2 Replies
2. Shell Programming and Scripting
Dear Sir,
I am Shidlingayya India, i am new to unix script..my problem is
present-> I have to read the eeprom locations from 0 to 255 locations in separate file..i wrote the code for this as follows
@eep_save_all ;<filename> store eeprom data to intel hex file
kr 0,,02/n
wf %1,... (0 Replies)
Discussion started by: shidlingayya
0 Replies
3. Shell Programming and Scripting
I want to delete a particular string ( ex : berkely@abc.com ) from different locations and in different files in each location.
Please help me ! (4 Replies)
Discussion started by: nani_ynm
4 Replies
4. Solaris
this post is related to the arrangements of libraries in a solaris-8 distribution.
i want to build external packages on solaris-8
i need to know why libraries are scattered in a solaris distribution among different below mentioned directories,
please tell me whats the importance ??
/lib... (3 Replies)
Discussion started by: mobydick
3 Replies
5. Solaris
Hi Guys,
There was a post that I saw here a while ago regarding file system layout and what to put where, which I am unable to find now..
A user here posted a man page that list what each partition should have in it and what it is used for and were you should install custom packages.
ie:... (1 Reply)
Discussion started by: Tornado
1 Replies
6. Shell Programming and Scripting
Hi all,
My tar file exists in directory: /usr/users/rovolis/test1/archive.tar
Now from directory: /usr/users/rovolis/ i run the following command
tar xvzf /usr/users/rovolis/test1/archive.tar
The problem is that the extraction of files is not done
Any idea why?
Thank you (1 Reply)
Discussion started by: chriss_58
1 Replies
7. Shell Programming and Scripting
Hi everybody,
I need a script for below issue:
I have totally 15 different locations like */COUNTRY/in.
Only COUNTRy is the variable which changes for 15 countries.
For each location(one per country), there will be four files like abc_def_ddmmyyyy.txt, where ddmmyyyy is the old date.
... (1 Reply)
Discussion started by: rjanardhan83
1 Replies
8. Programming
I've got the following two queries:
1) What's the difference in performance if a variable storage is at bss and not at the data section (apart from the initialization to zero in case of data section variables --like static variables).
In general, why a developer need to bother about the... (1 Reply)
Discussion started by: Praveen_218
1 Replies
9. UNIX for Dummies Questions & Answers
Hi ,
I have a file which looks like this
source1 LEN predictive 392879 394347 0.955489 + . Name=sa000003.1;ID=sa000003;Alias=sa121751.1;
source1 LEN descriptive_1 391082 392878 . . . Parent=sa000003.1;supp_id=.1805.1;
... (3 Replies)
Discussion started by: siya@
3 Replies
10. Shell Programming and Scripting
I have a backup script that runs on CRON that I developed about 5 years ago. It has always worked perfectly but a recent firmware update on my QNAP TS 259 has seem to break the large file move/copy capability amongst the ESATA drives.
I would like to just change my backhup.sh so that writes... (3 Replies)
Discussion started by: mackconsult
3 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)