diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-02-22 21:50:10 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-02-22 20:59:55 -0800 |
| commit | d516c2d11945cf13ed3d961fa63817c60b7a566b (patch) | |
| tree | 7d9aa00054be3a60e6ababc94aa0ccaa573b768f /Documentation/git-diff.txt | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-d516c2d11945cf13ed3d961fa63817c60b7a566b.tar.xz | |
Teach git-diff-files the new option `--no-index`
With this flag and given two paths, git-diff-files behaves as a GNU diff
lookalike (plus the git goodies like --check, colour, etc.). This flag
is also available in git-diff. It also works outside of a git repository.
In addition, if git-diff{,-files} is called without revision or stage
parameter, and with exactly two paths at least one of which is not tracked,
the default is --no-index.
So, you can now say
git diff /etc/inittab /etc/fstab
and it actually works!
This also unifies the duplicated argument parsing between cmd_diff_files()
and builtin_diff_files().
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-diff.txt')
| -rw-r--r-- | Documentation/git-diff.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 6a098df26b..12a531d1e9 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -23,6 +23,10 @@ tree and the index file, or the index file and the working tree. further add to the index but you still haven't. You can stage these changes by using gitlink:git-add[1]. + If exactly two paths are given, and at least one is untracked, + compare the two files / directories. This behavior can be + forced by --no-index. + 'git-diff' [--options] --cached [<commit>] [--] [<path>...]:: This form is to view the changes you staged for the next |