diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-08 02:26:23 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-08 02:45:20 +0200 |
| commit | 215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7 (patch) | |
| tree | 6bc7aa4f652d0ef49108d9e30a7ea7fbf8e44639 /Documentation/git-octopus.txt | |
| parent | GIT 0.99.6 (diff) | |
| download | git-215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7.tar.xz git-215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7.zip | |
Big tool rename.
As promised, this is the "big tool rename" patch. The primary differences
since 0.99.6 are:
(1) git-*-script are no more. The commands installed do not
have any such suffix so users do not have to remember if
something is implemented as a shell script or not.
(2) Many command names with 'cache' in them are renamed with
'index' if that is what they mean.
There are backward compatibility symblic links so that you and
Porcelains can keep using the old names, but the backward
compatibility support is expected to be removed in the near
future.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-octopus.txt')
| -rw-r--r-- | Documentation/git-octopus.txt | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/Documentation/git-octopus.txt b/Documentation/git-octopus.txt new file mode 100644 index 0000000000..7a9cc542d3 --- /dev/null +++ b/Documentation/git-octopus.txt @@ -0,0 +1,39 @@ +git-octopus(1) +============== +v0.99.5, Aug 2005 + +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 link:git.html[git] suite + |