summaryrefslogtreecommitdiffstats
path: root/cmds-mainporcelain.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-02-14 07:23:58 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-02-14 07:23:58 +0000
commit053827fc208a615853d69ff66269e9c1600b7fa0 (patch)
tree8c0e18f41368070a515bd63482c1fcae9bf3528c /cmds-mainporcelain.txt
parent4b0130fa1a667a1c3bf0d3d7e810c6a536cf580f (diff)
downloadgit-htmldocs-053827fc208a615853d69ff66269e9c1600b7fa0.tar.gz
Autogenerated HTML docs for v1.5.0-19-gddff
Diffstat (limited to 'cmds-mainporcelain.txt')
-rw-r--r--cmds-mainporcelain.txt3
1 files changed, 0 insertions, 3 deletions
diff --git a/cmds-mainporcelain.txt b/cmds-mainporcelain.txt
index 9a59c0305..49922e672 100644
--- a/cmds-mainporcelain.txt
+++ b/cmds-mainporcelain.txt
@@ -73,9 +73,6 @@ gitlink:git-rebase[1]::
gitlink:git-reset[1]::
Reset current HEAD to the specified state.
-gitlink:git-resolve[1]::
- Merge two commits.
-
gitlink:git-revert[1]::
Revert an existing commit.