summaryrefslogtreecommitdiff
path: root/Documentation/git-octopus.txt
blob: 6e32ea347c415a1849d58f80779f45257c9898df (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
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