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 /git-merge-one-file-script | |
| parent | [PATCH] Rework built-in diff to make its output more dense. (diff) | |
| download | tgif-5d2f8b2753183e6cf2238a6f2d847e54211ba11f.tar.xz | |
[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 'git-merge-one-file-script')
0 files changed, 0 insertions, 0 deletions