Information Technology Reference
In-Depth Information
The other complementary parameter,
--max-parent=n
sets the requirements for
the maximal number of parents for commits printed by
$ git log
.
Of course, the ability to merge numerous branches is not crucial. The operation:
$ git merge a b c d
can be executed as four different merges each of them concerns only two branches:
$ git merge a
$ git merge b
$ git merge c
$ git merge d
The only drawback of the above is that the history will contain four merge commits
instead of one.
Summary
Now, that you know
$ git merge
, you can begin to fully appreciate the
git branch-
ing model
. Using
$ git merge
you deal with the
branch you merge into
and the
branch you merge in
. The branch you merge into is your current branch. The branch
you merge in is the branch passed to the
$ git merge
command. If the command
$
git branch
prints:
bar
* foo
then for
$ git merge bar
we have:
•
foo
is the branch you merge into
•
bar
is the branch you merge in
In general, the
$ git merge
command performs one of two operations: it is
either a
fast-forward
or a
merge
.
