diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:23:46 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:23:46 -0700 |
commit | c8eb5d33092ebf7e6fadb89d4cbd78071b052595 (patch) | |
tree | 47d49079d13efea876db4ad3fb93ccb3ef327faf /contrib/diffall/README | |
parent | 067fe6435534588bfd63857663532861d711d56e (diff) | |
parent | 502b0a1ad145a7d77733008946c833ba7d3d100d (diff) | |
download | git-c8eb5d33092ebf7e6fadb89d4cbd78071b052595.tar.gz git-c8eb5d33092ebf7e6fadb89d4cbd78071b052595.tar.xz |
Merge branch 'jn/contrib-remove-diffall'
Spring cleaning of contrib/.
* jn/contrib-remove-diffall:
contrib: remove git-diffall
Diffstat (limited to 'contrib/diffall/README')
-rw-r--r-- | contrib/diffall/README | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/contrib/diffall/README b/contrib/diffall/README deleted file mode 100644 index 507f17dcd..000000000 --- a/contrib/diffall/README +++ /dev/null @@ -1,31 +0,0 @@ -The git-diffall script provides a directory based diff mechanism -for git. - -To determine what diff viewer is used, the script requires either -the 'diff.tool' or 'merge.tool' configuration option to be set. - -This script is compatible with most common forms used to specify a -range of revisions to diff: - - 1. git diffall: shows diff between working tree and staged changes - 2. git diffall --cached [<commit>]: shows diff between staged - changes and HEAD (or other named commit) - 3. git diffall <commit>: shows diff between working tree and named - commit - 4. git diffall <commit> <commit>: show diff between two named commits - 5. git diffall <commit>..<commit>: same as above - 6. git diffall <commit>...<commit>: show the changes on the branch - containing and up to the second, starting at a common ancestor - of both <commit> - -Note: all forms take an optional path limiter [-- <path>*] - -The '--extcmd=<command>' option allows the user to specify a custom -command for viewing diffs. When given, configured defaults are -ignored and the script runs $command $LOCAL $REMOTE. Additionally, -$BASE is set in the environment. - -This script is based on an example provided by Thomas Rast on the -Git list [1]: - -[1] http://thread.gmane.org/gmane.comp.version-control.git/124807 |