From: Junio C Hamano <junkio@cox.net>
Date: Thu, 4 May 2006 07:14:56 +0000 (-0700)
Subject: Merge branch 'js/fetchconfig' into next
X-Git-Tag: v1.4.1-rc1~136
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4cc0b8a41b25356ad89f13ec2735756e5dada02a;p=git.git

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
---

4cc0b8a41b25356ad89f13ec2735756e5dada02a
diff --cc Makefile
index ecbdde6ef,a3f7e92d0..e9d9e101d
--- a/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 7f06812b8,bb63f0729..97e246446
--- a/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 d5f0faa90,49ba5189d..84803a62e
--- a/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;