From: Junio C Hamano <junkio@cox.net>
Date: Fri, 19 May 2006 05:08:41 +0000 (-0700)
Subject: Merge branch 'ts/doctar' into next
X-Git-Tag: v1.4.1-rc1~84
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2c57ebc22329e11fc4843f62fe464a4e0c212176;p=git.git

Merge branch 'ts/doctar' into next

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

2c57ebc22329e11fc4843f62fe464a4e0c212176
diff --cc Makefile
index 3a2858061,c33a4d2b3..4e4a9d088
--- a/Makefile
+++ 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.h
index ccd0e31b2,ff559dec7..78275ea45
--- a/builtin.h
+++ 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 6a470cf14,d0650bb40..7db5cc1a5
--- a/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;