summaryrefslogtreecommitdiff
path: root/Documentation/git-diff-tree.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-30 07:09:07 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-31 01:10:46 (GMT)
commitaf5323e0274fad058f13949b89a9191a7bef7e38 (patch)
tree6bf28a92074958605af6e31e46bf12bbaef6f726 /Documentation/git-diff-tree.txt
parent2036d841020b7500eca7d568bd0c353b4fe73408 (diff)
downloadgit-af5323e0274fad058f13949b89a9191a7bef7e38.zip
git-af5323e0274fad058f13949b89a9191a7bef7e38.tar.gz
git-af5323e0274fad058f13949b89a9191a7bef7e38.tar.bz2
[PATCH] Add -O<orderfile> option to diff-* brothers.
A new diffcore filter diffcore-order is introduced. This takes a text file each of whose line is a shell glob pattern. Patches that match a glob pattern on an earlier line in the file are output before patches that match a later line, and patches that do not match any glob pattern are output last. A typical orderfile for git project probably should look like this: README Makefile Documentation *.h *.c Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/git-diff-tree.txt')
-rw-r--r--Documentation/git-diff-tree.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index f236949..9e03885 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -9,7 +9,7 @@ git-diff-tree - Compares the content and mode of blobs found via two tree object
SYNOPSIS
--------
-'git-diff-tree' [-p] [-r] [-z] [--stdin] [-B] [-M] [-R] [-C] [-S<string>] [--pickaxe-all] [-m] [-s] [-v] [-t] <tree-ish> <tree-ish> [<pattern>]\*
+'git-diff-tree' [-p] [-r] [-z] [--stdin] [-B] [-M] [-R] [-C] [-O<orderfile>] [-S<string>] [--pickaxe-all] [-m] [-s] [-v] [-t] <tree-ish> <tree-ish> [<pattern>]\*
DESCRIPTION
-----------
@@ -53,6 +53,10 @@ OPTIONS
changeset, not just the files that contains the change
in <string>.
+-O<orderfile>::
+ Output the patch in the order specified in the
+ <orderfile>, which has one shell glob pattern per line.
+
-r::
recurse