mirror of
https://github.com/git/git.git
synced 2024-09-28 07:40:44 +02:00
d288a70030
We always show the diff as an absolute path, but pathnames to diff are taken relative to the current working directory (and if no pathnames are given, the default ends up being all of the current working directory). Note that "../xyz" also works, so you can do cd linux/drivers/char git diff ../block and it will generate a diff of the linux/drivers/block changes. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
18 lines
395 B
Bash
Executable File
18 lines
395 B
Bash
Executable File
#!/bin/sh
|
|
rev=($(git-rev-parse --revs-only "$@")) || exit
|
|
flags=($(git-rev-parse --no-revs --flags "$@"))
|
|
files=($(git-rev-parse --no-revs --no-flags "$@"))
|
|
case "${#rev[*]}" in
|
|
0)
|
|
git-diff-files -M -p "$@";;
|
|
1)
|
|
git-diff-cache -M -p "$@";;
|
|
2)
|
|
begin=$(echo "${rev[1]}" | tr -d '^')
|
|
end="${rev[0]}"
|
|
git-diff-tree -M -p $flags $begin $end $files;;
|
|
*)
|
|
echo "I don't understand"
|
|
exit 1;;
|
|
esac
|