git/git-diff.sh, branch gitk-resize-error

builtin-diff: call it "git-diff", really.

2006-05-02T06:07:28Z

Call it "git diff" not "git diffn", remove the shell script version, and hardlink the git binary to it. Signed-off-by: Junio C Hamano

diff-options: add --stat (take 2)

2006-04-13T23:48:24Z

Now, you can say "git diff --stat" (to get an idea how many changes are uncommitted), or "git log --stat". Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

git-diff: -p disables rename detection.

2006-03-12T01:44:10Z

git-diff: do not fall back on --cc when -[123], --ours etc. are given.

2006-02-06T19:22:07Z

These flags ask diff with a specific unmerged stage, so it should fall back on -p instead. Also when -c is given, we should not do --cc. Signed-off-by: Junio C Hamano

git-diff: use --cc instead of -p.

2006-02-06T00:37:18Z

The --cc output is much nicer when dealing with merges, so use it by default. Signed-off-by: Junio C Hamano

git-diff: Usage string clean-up

2005-12-16T00:02:04Z

Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano

Merge branch 'jc/subdir'

2005-11-30T19:09:33Z

git-diff: do not turn off -p/-M with any diff options.

2005-11-30T06:46:12Z

When the user gives a diff option (e.g. --cached) to "git diff", we turned off the built-in default option -p, which is usually not what user wants to see. This commit makes lack of --name-status, --name-only nor -r to add -p, and lack of -B*, -C* nor -M* to add -M to the flags given to the underlying diff. Signed-off-by: Junio C Hamano

define die() for scripts that use it.

2005-11-29T07:13:03Z

As a fallout from not using git-sh-setup in scripts that can operate from a subdirectory, we lost definition of die() from them. It might make sense to do some cleanup to consolidate them back again, but this should suffice for now. Signed-off-by: Junio C Hamano

Teach "git diff" to handle filenames starting with '-'

2005-10-18T07:16:45Z

It adds "--" to the git-diff.sh scripts, to keep any filenames that start with a "-" from being confused with an option. But in order to do that, it needs to teach git-diff-files to honor "--". Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano