diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-03 22:14:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-03 23:05:34 -0800 |
| commit | d77ee72662a821d66ae218056f0103eb24d8d4b4 (patch) | |
| tree | e22abdbd11735a0669362f934ae723d233c87e2b /Documentation/diff-format.txt | |
| parent | eb8381c88518b10d683a29deea1d43ed671f14ec (diff) | |
| parent | 8d0fc48f27304ac1bc7abf802ec53fe66fedb15a (diff) | |
| download | git-d77ee72662a821d66ae218056f0103eb24d8d4b4.tar.gz | |
Merge branch 'master' into np/dreflog
This is to resolve conflicts early in preparation for possible
inclusion of "reflog on detached HEAD" series by Nico, as having
it in 1.5.0 would really help us remove confusion between
detached and attached states.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/diff-format.txt')
| -rw-r--r-- | Documentation/diff-format.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index 883c1bb0a6..378e72f38f 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -159,7 +159,7 @@ or like this (when '--cc' option is used): deleted file mode <mode>,<mode> + The `mode <mode>,<mode>..<mode>` line appears only if at least one of -the <mode> is diferent from the rest. Extended headers with +the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree-ish> and are not used by combined diff format. |