undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation/git-resolve: deprecated.

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2007-01-17 13:00:23 -08:00
parent 556b6600b2
commit 475abf1b63
1 changed files with 2 additions and 0 deletions

2
Documentation/git-resolve.txt
View File

@ -12,6 +12,8 @@ SYNOPSIS
DESCRIPTION DESCRIPTION
----------- -----------
DEPRECATED. Use `git-merge` instead.
Given two commits and a merge message, merge the <merged> commit Given two commits and a merge message, merge the <merged> commit
into <current> commit, with the commit log message <message>. into <current> commit, with the commit log message <message>.