Merge branch 'lt/push' into next
authorJunio C Hamano <junkio@cox.net>
Sun, 30 Apr 2006 08:00:55 +0000 (01:00 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 30 Apr 2006 08:00:55 +0000 (01:00 -0700)
* lt/push:
  git builtin "push"
  git-format-patch: Use rfc2822 compliant date.

1  2 
Makefile
builtin.h
git.c

diff --cc Makefile
index 895e6a1e4a7bc8a903b615f5852abbea862b403c,99199923928f50b7b32beea673d01b448d6b3028..f184a8d4bb34a8a1a588732326f755dda2d81df3
+++ 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 bf310dda9e2dbd45352ac1764bc911caaca549c3,94fa9b546512fa6592eb87dba93b68b6bd024fb9..8d5744fa42add9926721d8a9702f0677180b6b48
+++ 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 a6ec3bcbe52b3f245f8304003eb1af39debec98f,fd479e97c1e44df08357d47caa3260b2a7bc3ba3..6a771747ebec9cda926a4a1546d35f0944e1ab74
--- 1/git.c
--- 2/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;