[PATCH] git-http-fetch: Allow caching of retrieved objects by proxy servers
[git/gitweb.git] / Documentation / git-octopus.txt
blob7a9cc542d30f78044a39fe81c4ed1e21957f8293
1 git-octopus(1)
2 ==============
3 v0.99.5, Aug 2005
5 NAME
6 ----
7 git-octopus - Merge more than two commits.
10 SYNOPSIS
11 --------
12 'git-octopus'
14 DESCRIPTION
15 -----------
16 After running 'git fetch', $GIT_DIR/FETCH_HEAD contains the
17 following information, one line per remote ref:
19 ------------------------------------------------
20 <object name>   <ref name> from <repository>
21 ------------------------------------------------
23 Using this information, create and commit an Octopus merge on
24 top of the current HEAD.
27 Author
28 ------
29 Written by Junio C Hamano <junkio@cox.net>
32 Documentation
33 --------------
34 Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
36 GIT
37 ---
38 Part of the link:git.html[git] suite