OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
556b660
)
Documentation/git-resolve: deprecated.
author
Junio C Hamano
<junkio@cox.net>
Wed, 17 Jan 2007 21:00:23 +0000
(13:00 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 17 Jan 2007 21:00:23 +0000
(13:00 -0800)
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-resolve.txt
patch
|
blob
|
history
diff --git
a/Documentation/git-resolve.txt
b/Documentation/git-resolve.txt
index
4e57c2b
..
0925973
100644
(file)
--- a/
Documentation/git-resolve.txt
+++ b/
Documentation/git-resolve.txt
@@
-12,6
+12,8
@@
SYNOPSIS
DESCRIPTION
-----------
+DEPRECATED. Use `git-merge` instead.
+
Given two commits and a merge message, merge the <merged> commit
into <current> commit, with the commit log message <message>.