projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GIT 0.99.9c
[git.git]
/
Documentation
/
git-resolve.txt
diff --git
a/Documentation/git-resolve.txt
b/Documentation/git-resolve.txt
index
d058318
..
4e57c2b
100644
(file)
--- a/
Documentation/git-resolve.txt
+++ b/
Documentation/git-resolve.txt
@@
-1,6
+1,5
@@
git-resolve(1)
==============
git-resolve(1)
==============
-v0.99.5, Aug 2005
NAME
----
NAME
----
@@
-9,7
+8,7
@@
git-resolve - Merge two commits
SYNOPSIS
--------
SYNOPSIS
--------
-'git
resolve' <current> <merged> <message>
+'git
-
resolve' <current> <merged> <message>
DESCRIPTION
-----------
DESCRIPTION
-----------
@@
-33,5
+32,5
@@
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
GIT
---
GIT
---
-Part of the
link:git.html[git
] suite
+Part of the
gitlink:git[7
] suite