diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-24 16:23:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-24 16:50:54 -0700 |
| commit | ab9b31386b494b6c16d651d1560f3ba11c3a1964 (patch) | |
| tree | b236326ca11e2180a58dd15cbde457871bb56244 /Documentation/git-octopus-script.txt | |
| parent | ff27adf3dae36695f1af1b6f0e01ec6738ce0249 (diff) | |
| download | git-ab9b31386b494b6c16d651d1560f3ba11c3a1964.tar.gz git-ab9b31386b494b6c16d651d1560f3ba11c3a1964.tar.xz | |
Documentation: multi-head fetch.
Add documentation related to multi-head work, including $GIT_DIR/remotes/
changes.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-octopus-script.txt')
| -rw-r--r-- | Documentation/git-octopus-script.txt | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/Documentation/git-octopus-script.txt b/Documentation/git-octopus-script.txt new file mode 100644 index 000000000..f7a073d4f --- /dev/null +++ b/Documentation/git-octopus-script.txt @@ -0,0 +1,39 @@ +git-octopus-script(1) +===================== +v0.99.5, Aug 2005 + +NAME +---- +git-octopus-script - 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 + |