mirror of
https://github.com/git/git.git
synced 2024-11-18 17:13:55 +01:00
ce24067549
This patch updates diff documentation and usage strings: - clarify the semantics of -R. It is not "output in reverse"; rather, it is "I will feed diff backwards". Semantically they are different when -C is involved. - describe -O in usage strings of diff-* brothers. It was implemented, documented but not described in usage text. Also it adds -O to diff-helper. Like -S (and unlike -M/-C/-B), this option can work on sanitized diff-raw output produced by the diff-* brothers. While we are at it, the call it makes to diffcore is cleaned up to use the diffcore_std() like everybody else, and the declaration for the low level diffcore routines are moved from diff.h (public) to diffcore.h (private between diff.c and diffcore backends). Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
49 lines
901 B
Plaintext
49 lines
901 B
Plaintext
git-diff-helper(1)
|
|
==================
|
|
v0.1, May 2005
|
|
|
|
NAME
|
|
----
|
|
git-diff-helper - Generates patch format output for git-diff-*
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-diff-helper' [-z] [-S<string>] [-O<orderfile>]
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
Reads output from "git-diff-cache", "git-diff-tree" and "git-diff-files" and
|
|
generates patch format output.
|
|
|
|
OPTIONS
|
|
-------
|
|
-z::
|
|
\0 line termination on input
|
|
|
|
-S<string>::
|
|
Look for differences 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.
|
|
|
|
See Also
|
|
--------
|
|
The section on generating patches in link:git-diff-cache.html[git-diff-cache]
|
|
|
|
|
|
Author
|
|
------
|
|
Written by Junio C Hamano <junkio@cox.net>
|
|
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the link:git.html[git] suite
|
|
|