Merge branch 'js/fetchconfig' into next

* js/fetchconfig:
  Add a conversion tool to migrate remote information into the config
  fetch, pull: ask config for remote information
  Add a few more words to the glossary.
  Added definitions for a few words:
  Alphabetize the glossary.
  sha1_to_hex() usage cleanup

diff --cc Makefile
index ecbdde6ef973b9668b83bff85c9abe92dcc29fd9,a3f7e92d01422b95c183fb9bff560ba779a7567c..e9d9e101d393dd037728fa4552d8b9fc03270557
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -215,8 -215,7 +215,8 @@@ LIB_OBJS = 
        $(DIFF_OBJS)
  
  BUILTIN_OBJS = \
-       builtin-log.o builtin-help.o builtin-count.o builtin-diff.o \
-       builtin-push.o builtin-grep.o
 -      builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o
++      builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
++      builtin-grep.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz

diff --cc builtin.h
index 7f06812b8674fdfe5f54d901677320d7f8717a97,bb63f0729a4a05e60ef3e609b971bdf57b60b06d..97e24644687d819fddf57beaaddf4bdda731bb82
--- 1/builtin.h
--- 2/builtin.h
+++ b/builtin.h
@@@ -19,10 -19,9 +19,11 @@@ extern int cmd_version(int argc, const 
  extern int cmd_whatchanged(int argc, const char **argv, char **envp);
  extern int cmd_show(int argc, const char **argv, char **envp);
  extern int cmd_log(int argc, const char **argv, char **envp);
+ extern int cmd_diff(int argc, const char **argv, char **envp);
 +extern int cmd_format_patch(int argc, const char **argv, char **envp);
  extern int cmd_count_objects(int argc, const char **argv, char **envp);
- extern int cmd_diff(int argc, const char **argv, char **envp);
+ 
  extern int cmd_push(int argc, const char **argv, char **envp);
 +extern int cmd_grep(int argc, const char **argv, char **envp);
  
  #endif

diff --cc git.c
index d5f0faa9077b0a769c8b36d47cc08cbf86b9d564,49ba5189d923493aaed40a6a0fccc2ead040b06a..84803a62e6c4dc6b64aaf5d1fda9991be535048a
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -46,11 -46,9 +46,11 @@@ static void handle_internal_command(in
                { "log", cmd_log },
                { "whatchanged", cmd_whatchanged },
                { "show", cmd_show },
+               { "push", cmd_push },
 +              { "fmt-patch", cmd_format_patch },
                { "count-objects", cmd_count_objects },
                { "diff", cmd_diff },
-               { "push", cmd_push },
 +              { "grep", cmd_grep },
        };
        int i;