projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GIT 0.99.9c
[git.git]
/
Documentation
/
git-merge.txt
diff --git
a/Documentation/git-merge.txt
b/Documentation/git-merge.txt
index
dca363d
..
8c9c4d8
100644
(file)
--- a/
Documentation/git-merge.txt
+++ b/
Documentation/git-merge.txt
@@
-1,6
+1,5
@@
git-merge(1)
============
git-merge(1)
============
-v0.99.6, Sep 2005
NAME
----
NAME
----
@@
-29,6
+28,11
@@
OPTIONS
there is no `-s` option, built-in list of strategies is
used instead.
there is no `-s` option, built-in list of strategies is
used instead.
+<msg>::
+ The commit message to be used for the merge commit (in case
+ it is created). The `git-fmt-merge-msg` script can be used
+ to give a good default for automated `git-merge` invocations.
+
<head>::
our branch head commit.
<head>::
our branch head commit.
@@
-38,6
+42,11
@@
OPTIONS
obviously means you are trying an Octopus.
obviously means you are trying an Octopus.
+SEE ALSO
+--------
+gitlink:git-fmt-merge-msg[1]
+
+
Author
------
Written by Junio C Hamano <junkio@cox.net>
Author
------
Written by Junio C Hamano <junkio@cox.net>