summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-13 09:54:15 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-13 09:54:15 (GMT)
commit803f498c03b47b1da88cf8f14ba2c374f0fc16d3 (patch)
tree40fe9b5eb74d9f5dc8a212644f7bb1a7ee5a9db9
parent76cead391f77142f153ceafcb21ba50f0b09dd15 (diff)
downloadgit-803f498c03b47b1da88cf8f14ba2c374f0fc16d3.zip
git-803f498c03b47b1da88cf8f14ba2c374f0fc16d3.tar.gz
git-803f498c03b47b1da88cf8f14ba2c374f0fc16d3.tar.bz2
Documentation: diff examples.
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/git-diff.txt62
-rw-r--r--Documentation/git-format-patch.txt9
2 files changed, 71 insertions, 0 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index cf7527f..b04f393 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -40,6 +40,68 @@ OPTIONS
commands.
+EXAMPLES
+--------
+
+Various ways to check your working tree::
++
+------------
+$ git diff <1>
+$ git diff --cached <2>
+$ git diff HEAD <3>
+
+<1> changes in the working tree since your last git-update-index.
+<2> changes between the index and your last commit; what you
+would be committing if you run "git commit" without "-a" option.
+<3> changes in the working tree since your last commit; what you
+would be committing if you run "git commit -a"
+------------
+
+Comparing with arbitrary commits::
++
+------------
+$ git diff test <1>
+$ git diff HEAD -- ./test <2>
+$ git diff HEAD^ HEAD <3>
+
+<1> instead of using the tip of the current branch, compare with the
+tip of "test" branch.
+<2> instead of comparing with the tip of "test" branch, compare with
+the tip of the curren branch, but limit the comparison to the
+file "test".
+<3> compare the version before the last commit and the last commit.
+------------
+
+
+Limiting the diff output::
++
+------------
+$ git diff --diff-filter=MRC <1>
+$ git diff --name-status -r <2>
+$ git diff arch/i386 include/asm-i386 <3>
+
+<1> show only modification, rename and copy, but not addition
+nor deletion.
+<2> show only names and the nature of change, but not actual
+diff output. --name-status disables usual patch generation
+which in turn also disables recursive behaviour, so without -r
+you would only see the directory name if there is a change in a
+file in a subdirectory.
+<3> limit diff output to named subtrees.
+------------
+
+Munging the diff output::
++
+------------
+$ git diff --find-copies-harder -B -C <1>
+$ git diff -R <2>
+
+<1> spend extra cycles to find renames, copies and complete
+rewrites (very expensive).
+<2> output diff in reverse.
+------------
+
+
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index abb8fc8..d7ca2db 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -84,6 +84,15 @@ git-format-patch origin::
pulled from origin the last time in a patch form for
e-mail submission.
+git-format-patch -M -B origin::
+ The same as the previous one, except detect and handle
+ renames and complete rewrites intelligently to produce
+ renaming patch. A renaming patch reduces the amount of
+ text output, and generally makes it easier to review
+ it. Note that the "patch" program does not understand
+ renaming patch well, so use it only when you know the
+ recipient uses git to apply your patch.
+
See Also
--------