git-diffall is now in git contribs

[git-utils.git] / git-diffall.1

diff --git a/git-diffall.1 b/git-diffall.1
index fa1d55c5e4c8b5f0d67e31079f7e5415f6d62f49..6c8302c69a214315ed7156a41cd4d19e3ef506b8 100644 (file)
--- a/git-diffall.1
+++ b/git-diffall.1
@@ -4,17 +4,31 @@
 git-diffall \- Use a visual diff tool to show all differences
 
 .SH SYNOPSIS
-\fBgit-diffall\fR [\fIPRE\fR] [\fIPOST\fR]
+\fBgit-diffall\fR [\fI--cached\fR] [\fI--copy-back\fR]
+        [\fI-x|--extcmd=<command>\fR] <commit>{0,2} [\fI-- <path>*\fR]
 
 .SH "DESCRIPTION"
 
 .PP
-\fBgit-diffall\fR performs a visual diff using kdiff3 between PRE and POST
-of the current project.  No arguments will show the differences between the
-working directory and HEAD.  If in the git config diff.tool is set, this
-program is passed the name of the two temporary directories containing the
-changed files of each revision.  If diff.tool is not defined, the fall-back
-is to diff.
+\fBgit-diffall\fR performs a diff using the configured diff.tool or merge.tool.
+
+    --cached     Compare to the index rather than the working tree.
+
+    --copy-back  Copy files back to the working tree when the diff
+                 tool exits (in case they were modified by the
+                 user).  This option is only valid if the diff
+                 compared with the working tree.
+
+    -x=<command>
+    --extcmd=<command>
+                 Specify a custom command for viewing diffs.
+                 git-diffall ignores the configured defaults and
+                 runs $command $LOCAL $REMOTE when this option is
+                 specified. Additionally, $BASE is set in the
+                 environment.
+
+Thanks to Tim Henigan <tim.henigan@gmail.com> who created a newer version now
+released with git contribs.
 
 Thanks to Thomas Rast for publishing this script online:
 http://thread.gmane.org/gmane.comp.version-control.git/124807