diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-07 18:37:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-13 03:33:03 (GMT) |
| commit | 207dfa07919baba034291f1d5169f86272839d59 (patch) | |
| tree | b177a070dc2902fa269865e8d41d3a8e825c4aef /Documentation/git-resolve.txt | |
| parent | 07fef5fc1599d11f5750ae2440e0da6616c297b8 (diff) | |
| download | git-207dfa07919baba034291f1d5169f86272839d59.zip git-207dfa07919baba034291f1d5169f86272839d59.tar.gz git-207dfa07919baba034291f1d5169f86272839d59.tar.bz2 | |
Remove git-resolve.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-resolve.txt')
| -rw-r--r-- | Documentation/git-resolve.txt | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt deleted file mode 100644 index 7fde665..0000000 --- a/Documentation/git-resolve.txt +++ /dev/null @@ -1,38 +0,0 @@ -git-resolve(1) -============== - -NAME ----- -git-resolve - Merge two commits - - -SYNOPSIS --------- -'git-resolve' <current> <merged> <message> - -DESCRIPTION ------------ -DEPRECATED and will be removed in 1.5.1. Use `git-merge` instead. - -Given two commits and a merge message, merge the <merged> commit -into <current> commit, with the commit log message <message>. - -When <current> is a descendant of <merged>, or <current> is an -ancestor of <merged>, no new commit is created and the <message> -is ignored. The former is informally called "already up to -date", and the latter is often called "fast forward". - - -Author ------- -Written by Linus Torvalds <torvalds@osdl.org> and -Dan Holmsand <holmsand@gmail.com>. - -Documentation --------------- -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. - -GIT ---- -Part of the gitlink:git[7] suite - |