mirror of
https://github.com/git/git.git
synced 2024-11-07 09:43:00 +01:00
5c97558c9a
This rips out the rename detection engine from diff-helper and moves it to the diff core, and updates the internal calling convention used by diff-tree family into the diff core. In order to give the same option name to diff-tree family as well as to diff-helper, I've changed the earlier diff-helper '-r' option to '-M' (stands for Move; sorry but the natural abbreviation 'r' for 'rename' is already taken for 'recursive'). Although I did a fair amount of test with the git-diff-tree with existing rename commits in the core GIT repository, this should still be considered beta (preview) release. This patch depends on the diff-delta infrastructure just committed. This implements almost everything I wanted to see in this series of patch, except a few minor cleanups in the calling convention into diff core, but that will be a separate cleanup patch. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
55 lines
1,000 B
Text
55 lines
1,000 B
Text
git-diff-helper(1)
|
|
=======================
|
|
v0.1, May 2005
|
|
|
|
NAME
|
|
----
|
|
git-diff-helper - Generates patch format output for git-diff-*
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-diff-helper' [-z] [-R] [-M]
|
|
|
|
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
|
|
|
|
-R::
|
|
Output diff in reverse. This is useful for displaying output from
|
|
"git-diff-cache" which always compares tree with cache or working
|
|
file. E.g.
|
|
|
|
git-diff-cache <tree> | git-diff-helper -R file.c
|
|
|
|
would show a diff to bring the working file back to what
|
|
is in the <tree>.
|
|
|
|
-M::
|
|
Detect renames.
|
|
|
|
|
|
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
|
|
|