diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-12-21 00:01:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-21 00:01:00 -0800 |
| commit | c2f3bf071ee90b01f2d629921bb04c4f798f02fa (patch) | |
| tree | 08ffe5b40e062d596deee47f3869278f4661a858 /Documentation/git-octopus.txt | |
| parent | GIT 0.99.9n aka 1.0rc6 (diff) | |
| parent | Make "git-send-pack" less verbose by default (diff) | |
| download | tgif-c2f3bf071ee90b01f2d629921bb04c4f798f02fa.tar.xz | |
GIT 1.0.0
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-octopus.txt')
| -rw-r--r-- | Documentation/git-octopus.txt | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/Documentation/git-octopus.txt b/Documentation/git-octopus.txt deleted file mode 100644 index 6e32ea347c..0000000000 --- a/Documentation/git-octopus.txt +++ /dev/null @@ -1,38 +0,0 @@ -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 - |