mirror of
https://github.com/git/git.git
synced 2024-11-17 22:44:49 +01:00
a7154e916c
The replacement was performed automatically by these commands: perl -pi -e 's/link:(git.+)\.html\[\1\]/gitlink:$1\[1\]/g' \ README Documentation/*.txt perl -pi -e 's/link:git\.html\[git\]/gitlink:git\[7\]/g' \ README Documentation/*.txt Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
37 lines
810 B
Text
37 lines
810 B
Text
git-resolve(1)
|
|
==============
|
|
v0.99.5, Aug 2005
|
|
|
|
NAME
|
|
----
|
|
git-resolve - Merge two commits
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git resolve' <current> <merged> <message>
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
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
|
|
|