Merge branch 'np/types' into jc/fetch

* np/types: (253 commits)
  get rid of lookup_object_type()
  convert object type handling from a string to a number
  formalize typename(), and add its reverse type_from_string()
  sha1_file.c: don't ignore an error condition in sha1_loose_object_info()
  sha1_file.c: cleanup "offset" usage
  sha1_file.c: cleanup hdr usage
  git-apply: do not fix whitespaces on context lines.
  diff --cc: integer overflow given a 2GB-or-larger file
  mailinfo: do not get confused with logical lines that are too long.
  Documentation: link in 1.5.0.2 material to the top documentation page.
  Documentation: document remote.<name>.tagopt
  GIT 1.5.0.2
  git-remote: support remotes with a dot in the name
  Documentation: describe "-f/-t/-m" options to "git-remote add"
  diff --cc: fix display of symlink conflicts during a merge.
  merge-recursive: fix longstanding bug in merging symlinks
  merge-index: fix longstanding bug in merging symlinks
  diff --cached: give more sensible error message when HEAD is yet to be created.
  Update tests to use test-chmtime
  Add test-chmtime: a utility to change mtime on files
  ...

diff --cc Makefile
index 181ad942796b2d77ba01fd9da84de218285d0484,8a42be9babb04a2a9f6eb0fba24a5fc8b5fe59a1..9f20f842215364744809b03ab5bfa9506931e94a
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -280,9 -286,7 +286,8 @@@ BUILTIN_OBJS = 
        builtin-diff.o \
        builtin-diff-files.o \
        builtin-diff-index.o \
-       builtin-diff-stages.o \
        builtin-diff-tree.o \
 +      builtin-fetch--tool.o \
        builtin-fmt-merge-msg.o \
        builtin-for-each-ref.o \
        builtin-fsck.o \

diff --cc builtin.h
index 3cad4028d2da4092bc9f7b2526e025b482d57fdf,57e8741ff0569a349a48e386fae2664fe474a546..9a25b79f87ee1b1b6944ecd2030126c1aff88539
--- 1/builtin.h
--- 2/builtin.h
+++ b/builtin.h
@@@ -29,9 -29,7 +29,8 @@@ extern int cmd_describe(int argc, cons
  extern int cmd_diff_files(int argc, const char **argv, const char *prefix);
  extern int cmd_diff_index(int argc, const char **argv, const char *prefix);
  extern int cmd_diff(int argc, const char **argv, const char *prefix);
- extern int cmd_diff_stages(int argc, const char **argv, const char *prefix);
  extern int cmd_diff_tree(int argc, const char **argv, const char *prefix);
 +extern int cmd_fetch__tool(int argc, const char **argv, const char *prefix);
  extern int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix);
  extern int cmd_for_each_ref(int argc, const char **argv, const char *prefix);
  extern int cmd_format_patch(int argc, const char **argv, const char *prefix);

diff --cc git-fetch.sh
Simple merge

diff --cc git.c
index a167b1e42e942cb420c0cf6ab3ae370780a8b517,83f3d90ee35418976baea4f032c13aed0ec9e664..2361b5fbbc4729c728159a7f2d79408a0ec1e8d6
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -240,9 -240,7 +240,8 @@@ static void handle_internal_command(in
                { "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 },
                { "diff-tree", cmd_diff_tree, RUN_SETUP },
 +              { "fetch--tool", cmd_fetch__tool, RUN_SETUP },
                { "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
                { "for-each-ref", cmd_for_each_ref, RUN_SETUP },
                { "format-patch", cmd_format_patch, RUN_SETUP },