diff options
Diffstat (limited to '')
| -rw-r--r-- | Documentation/git-resolve.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt index d058318194..4e57c2b287 100644 --- a/Documentation/git-resolve.txt +++ b/Documentation/git-resolve.txt @@ -1,6 +1,5 @@ git-resolve(1) ============== -v0.99.5, Aug 2005 NAME ---- @@ -9,7 +8,7 @@ git-resolve - Merge two commits SYNOPSIS -------- -'git resolve' <current> <merged> <message> +'git-resolve' <current> <merged> <message> DESCRIPTION ----------- @@ -33,5 +32,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite |