| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1 | git-resolve(1) |
| 2 | ============== |
| 3 | |
| 4 | NAME |
| 5 | ---- |
| 6 | git-resolve - Merge two commits |
| 7 | |
| 8 | |
| 9 | SYNOPSIS |
| 10 | -------- |
| 11 | 'git-resolve' <current> <merged> <message> |
| 12 | |
| 13 | DESCRIPTION |
| 14 | ----------- |
| 15 | Given two commits and a merge message, merge the <merged> commit |
| 16 | into <current> commit, with the commit log message <message>. |
| 17 | |
| 18 | When <current> is a descendant of <merged>, or <current> is an |
| 19 | ancestor of <merged>, no new commit is created and the <message> |
| 20 | is ignored. The former is informally called "already up to |
| 21 | date", and the latter is often called "fast forward". |
| 22 | |
| 23 | |
| 24 | Author |
| 25 | ------ |
| 26 | Written by Linus Torvalds <torvalds@osdl.org> and |
| 27 | Dan Holmsand <holmsand@gmail.com>. |
| 28 | |
| 29 | Documentation |
| 30 | -------------- |
| 31 | Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. |
| 32 | |
| 33 | GIT |
| 34 | --- |
| 35 | Part of the gitlink:git[7] suite |
| 36 | |
