Merge branch 'ts/doctar' into next
authorJunio C Hamano <junkio@cox.net>
Fri, 19 May 2006 05:08:41 +0000 (22:08 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 19 May 2006 05:08:41 +0000 (22:08 -0700)
* ts/doctar:
  Documentation/Makefile: create tarballs for the man pages and html files
  SubmittingPatches: The download location of External Editor has moved
  Make git-check-format-ref a builtin.
  Make "git rev-list" be a builtin
  builtin-diff: do not say files are renamed when blob and file are given
  Provide a way to flush git-diff-tree's output

1  2 
Makefile
builtin-diff.c
builtin-rev-list.c
builtin.h
git.c

diff --cc Makefile
index 3a2858061980a2848b078bfa8f6a872444a48fdb,c33a4d2b3e76b5a032c84c404cf2d62d383f63fc..4e4a9d0885f98884e4d942105d8e282844d7af6b
+++ b/Makefile
@@@ -170,7 -170,7 +170,7 @@@ PROGRAMS = 
  
  BUILT_INS = git-log$X git-whatchanged$X git-show$X \
        git-count-objects$X git-diff$X git-push$X \
-       git-grep$X git-add$X
 -      git-grep$X git-rev-list$X git-check-ref-format$X
++      git-grep$X git-add$X git-rev-list$X git-check-ref-format$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@ -218,7 -218,7 +218,7 @@@ LIB_OBJS = 
  
  BUILTIN_OBJS = \
        builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
-       builtin-grep.o builtin-add.o
 -      builtin-grep.o builtin-rev-list.o builtin-check-ref-format.o
++      builtin-grep.o builtin-add.o builtin-rev-list.o builtin-check-ref-format.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
diff --cc builtin-diff.c
Simple merge
Simple merge
diff --cc builtin.h
index ccd0e31b2c9e02a1acf79964183a7e9602d7f37c,ff559dec7ed85139394060ee647d260a830a3124..78275ea45124c1f4972288b5b02f6bc18745b1fe
+++ b/builtin.h
@@@ -25,6 -24,7 +25,8 @@@ extern int cmd_count_objects(int argc, 
  
  extern int cmd_push(int argc, const char **argv, char **envp);
  extern int cmd_grep(int argc, const char **argv, char **envp);
 +extern int cmd_add(int argc, const char **argv, char **envp);
+ extern int cmd_rev_list(int argc, const char **argv, char **envp);
+ extern int cmd_check_ref_format(int argc, const char **argv, char **envp);
  
  #endif
diff --cc git.c
index 6a470cf140768dc6a5ede397972698bdf67523c5,d0650bb4093ac5e9b872feee25119d1cbb7b0d22..7db5cc1a5544b1c5c96fff8e9a28cc3cf5382f32
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -51,7 -50,8 +51,9 @@@ static void handle_internal_command(in
                { "count-objects", cmd_count_objects },
                { "diff", cmd_diff },
                { "grep", cmd_grep },
 +              { "add", cmd_add },
+               { "rev-list", cmd_rev_list },
+               { "check-ref-format", cmd_check_ref_format }
        };
        int i;