Merge branch 'jc/merge-base' (early part)

diff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl
index 6dba8d8fe05769efa69ccc97ebdcbb2af0ca56e2..d4fd72db4c90c5106ec5cc829a06b3f845388ef2 100755 (executable)
--- a/Documentation/cmd-list.perl
+++ b/Documentation/cmd-list.perl
@@ -90,8 +90,8 @@ sub format_one {
 git-diff-files                          plumbinginterrogators
 git-diff-index                          plumbinginterrogators
 git-diff                                mainporcelain
-git-diff-stages                         plumbinginterrogators
 git-diff-tree                           plumbinginterrogators
+git-fast-import                                ancillarymanipulators
 git-fetch                               mainporcelain
 git-fetch-pack                          synchingrepositories
 git-fmt-merge-msg                       purehelpers
@@ -148,7 +148,6 @@ sub format_one {
 git-request-pull                        foreignscminterface
 git-rerere                              ancillaryinterrogators
 git-reset                               mainporcelain
-git-resolve                             mainporcelain
 git-revert                              mainporcelain
 git-rev-list                            plumbinginterrogators
 git-rev-parse                           ancillaryinterrogators