aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-resolve-script.txt
blob: 77076aa90dea8e7080ccdb5e0b64845018604ac7 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
git-resolve-script(1)
=====================
v0.99.5, Aug 2005

NAME
----
git-resolve-script - 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 link:git.html[git] suite