mirror of
https://github.com/git/git.git
synced 2024-11-18 17:03:56 +01:00
98438bd0e8
Signed-off-by: Christian Meder <chris@absolutegiganten.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
39 lines
686 B
Plaintext
39 lines
686 B
Plaintext
git-octopus(1)
|
|
==============
|
|
|
|
NAME
|
|
----
|
|
git-octopus - Merge more than two commits.
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-octopus'
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
After running 'git fetch', $GIT_DIR/FETCH_HEAD contains the
|
|
following information, one line per remote ref:
|
|
|
|
------------------------------------------------
|
|
<object name> <ref name> from <repository>
|
|
------------------------------------------------
|
|
|
|
Using this information, create and commit an Octopus merge on
|
|
top of the current HEAD.
|
|
|
|
|
|
Author
|
|
------
|
|
Written by Junio C Hamano <junkio@cox.net>
|
|
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the gitlink:git[7] suite
|
|
|