Merge branch 'mw/send-email' into next

* mw/send-email:
  Add --dry-run option to git-send-email
  git.spec.in: perl subpackage is installed in perl_vendorlib not vendorarch
  git-pull: we say commit X, not X commit.
  git-fetch --update-head-ok typofix
  paginate git-diff by default
This commit is contained in:
Junio C Hamano
2006-10-11 01:19:16 -07:00
5 changed files with 12 additions and 8 deletions

2
git.c
View File

@@ -227,7 +227,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
{ "check-ref-format", cmd_check_ref_format },
{ "commit-tree", cmd_commit_tree, RUN_SETUP },
{ "count-objects", cmd_count_objects, RUN_SETUP },
{ "diff", cmd_diff, RUN_SETUP },
{ "diff", cmd_diff, RUN_SETUP | USE_PAGER },
{ "diff-files", cmd_diff_files, RUN_SETUP },
{ "diff-index", cmd_diff_index, RUN_SETUP },
{ "diff-stages", cmd_diff_stages, RUN_SETUP },