From: Junio C Hamano <junkio@cox.net>
Date: Sun, 30 Apr 2006 08:00:55 +0000 (-0700)
Subject: Merge branch 'lt/push' into next
X-Git-Tag: v1.4.1-rc1~163
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6b401891a212950762e8673eaaebe4b6e6c79c0c;p=git.git

Merge branch 'lt/push' into next

* lt/push:
  git builtin "push"
  git-format-patch: Use rfc2822 compliant date.
---

6b401891a212950762e8673eaaebe4b6e6c79c0c
diff --cc Makefile
index 895e6a1e4,991999239..f184a8d4b
--- a/Makefile
+++ b/Makefile
@@@ -214,7 -214,7 +214,8 @@@ LIB_OBJS = 
  	$(DIFF_OBJS)
  
  BUILTIN_OBJS = \
- 	builtin-log.o builtin-help.o builtin-count.o builtin-diff.o
 -	builtin-log.o builtin-help.o builtin-push.o
++	builtin-log.o builtin-help.o builtin-count.o builtin-diff.o \
++	builtin-push.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
diff --cc builtin.h
index bf310dda9,94fa9b546..8d5744fa4
--- a/builtin.h
+++ b/builtin.h
@@@ -19,8 -19,7 +19,10 @@@ 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_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);
+ 
  #endif
diff --cc git.c
index a6ec3bcbe,fd479e97c..6a771747e
--- a/git.c
+++ b/git.c
@@@ -46,9 -46,7 +46,10 @@@ static void handle_internal_command(in
  		{ "log", cmd_log },
  		{ "whatchanged", cmd_whatchanged },
  		{ "show", cmd_show },
 +		{ "fmt-patch", cmd_format_patch },
 +		{ "count-objects", cmd_count_objects },
 +		{ "diffn", cmd_diff },
+ 		{ "push", cmd_push },
  	};
  	int i;