projects / thirdparty / git.git / blame
| Commit | Line | Data |
|---|---|---|
| 215a7ad1 JH |
1 | git-octopus(1) |
| 2 | ============== | |
| ab9b3138 JH |
3 | |
| 4 | NAME | |
| 5 | ---- | |
| 215a7ad1 | 6 | git-octopus - Merge more than two commits. |
| ab9b3138 JH |
7 | |
| 8 | ||
| 9 | SYNOPSIS | |
| 10 | -------- | |
| 11 | 'git-octopus' | |
| 12 | ||
| 13 | DESCRIPTION | |
| 14 | ----------- | |
| 15 | After running 'git fetch', $GIT_DIR/FETCH_HEAD contains the | |
| 16 | following information, one line per remote ref: | |
| 17 | ||
| 18 | ------------------------------------------------ | |
| 19 | <object name> <ref name> from <repository> | |
| 20 | ------------------------------------------------ | |
| 21 | ||
| 22 | Using this information, create and commit an Octopus merge on | |
| 23 | top of the current HEAD. | |
| 24 | ||
| 25 | ||
| 26 | Author | |
| 27 | ------ | |
| 28 | Written by Junio C Hamano <junkio@cox.net> | |
| 29 | ||
| 30 | ||
| 31 | Documentation | |
| 32 | -------------- | |
| 33 | Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. | |
| 34 | ||
| 35 | GIT | |
| 36 | --- | |
| a7154e91 | 37 | Part of the gitlink:git[7] suite |
| ab9b3138 | 38 |