diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-01 09:33:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-01 09:33:12 -0700 |
| commit | 5d2f8b2753183e6cf2238a6f2d847e54211ba11f (patch) | |
| tree | 875735be17d24d11433354682a32e96a12f003d8 /Makefile | |
| parent | c983370e5e208cca4deda82184478ba445a156e6 (diff) | |
| download | git-5d2f8b2753183e6cf2238a6f2d847e54211ba11f.tar.gz | |
[PATCH] Add git-apply-patch-script.
I said:
- Stop attempting to be compatible with cg-patch, and drop
(mode:XXXXXX) bits from the diff.
- Do keep the /dev/null change for created and deleted case.
- No "Index:" line, no "Mode change:" line, anywhere in the
output. Anything that wants the mode bits and sha1 hash can
do things from GIT_EXTERNAL_DIFF mechanism. Maybe document
suggested usage better.
This adds an example script git-apply-patch-script, that can be
used as the GIT_EXTERNAL_DIFF to apply changes between two trees
directly on the current work tree, like this:
GIT_EXTERNAL_DIFF=git-apply-patch-script git-diff-tree -p <tree> <tree>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -12,8 +12,8 @@ CFLAGS=-g -O2 -Wall CC=gcc AR=ar -SCRIPTS=git-merge-one-file-script git-prune-script git-pull-script \ - git-tag-script +SCRIPTS=git-apply-patch-script git-merge-one-file-script git-prune-script \ + git-pull-script git-tag-script PROG= git-update-cache git-diff-files git-init-db git-write-tree \ git-read-tree git-commit-tree git-cat-file git-fsck-cache \ |