From: Junio C Hamano <junkio@cox.net>
Date: Sun, 21 May 2006 09:59:51 +0000 (-0700)
Subject: Merge branch 'js/fmt-patch' into next
X-Git-Tag: v1.4.1-rc1~78
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f6ef6b852370da51bbd3d033c9d7e1bf62cac345;p=git.git

Merge branch 'js/fmt-patch' into next

* js/fmt-patch:
  git-format-patch: now built-in.
  fmt-patch: Support --attach
  diff family: add --check option
  Document that "git add" only adds non-ignored files.
---

f6ef6b852370da51bbd3d033c9d7e1bf62cac345
diff --cc Makefile
index 1d265a4d4,fbb3dca2f..d171829e0
--- a/Makefile
+++ b/Makefile
@@@ -113,10 -113,10 +113,10 @@@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__pow
  ### --- END CONFIGURATION SECTION ---
  
  SCRIPT_SH = \
 -	git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \
 +	git-bisect.sh git-branch.sh git-checkout.sh \
  	git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \
  	git-fetch.sh \
- 	git-format-patch.sh git-ls-remote.sh \
+ 	git-ls-remote.sh \
  	git-merge-one-file.sh git-parse-remote.sh \
  	git-prune.sh git-pull.sh git-rebase.sh \
  	git-repack.sh git-request-pull.sh git-reset.sh \
@@@ -170,9 -170,8 +170,9 @@@ 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-rev-list$X git-check-ref-format$X \
 -	git-init-db$X git-format-patch$X
 +	git-grep$X git-add$X git-rm$X git-rev-list$X \
 +	git-check-ref-format$X \
- 	git-init-db$X git-tar-tree$X git-upload-tar$X
++	git-init-db$X git-tar-tree$X git-upload-tar$X git-format-patch$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)