summaryrefslogtreecommitdiff
path: root/git-diff-script
AgeCommit message (Collapse)AuthorFilesLines
2005-09-07Big tool rename.Libravatar Junio C Hamano1-35/+0
As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-23Update git-diff-script.Libravatar Junio C Hamano1-20/+32
This uses the fixed rev-parse to allow passing diff options to the underlying diff command. For example: $ git diff -r HEAD shows the output in raw-diff format, and $ git diff -p -R HEAD | git apply generates a patch to go back from your working tree to HEAD commit (i.e. an expensive way to say "git checkout -f HEAD"). At the same time, it accidentally removes the use of shell arrays. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-22Fix "git-diff-script A B"Libravatar Junio C Hamano1-2/+8
When "git-diff-script A..B" notation was introduced, it ended up breaking the traditional two revisions notation. [jc: there are other issues with the current "git diff" I would like to address, but they would be left to later rounds. For example, -M and -p flags should not be hardcoded default, and it shouldn't be too hard to rewrite the script without using shell arrays.] Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-16[PATCH] Make "git diff" work inside relative subdirectoriesLibravatar Linus Torvalds1-3/+1
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>
2005-07-14Make "git diff" use git-sh-setup-script too..Libravatar Linus Torvalds1-0/+2
Give a sane error rather than just silently claiming no diffs when you're not at the top-level directory.
2005-07-06Use the new git-rev-parse "--[no-]flags" in "git diff".Libravatar Linus Torvalds1-2/+3
This allows you to do git diff v2.6.12..v2.6.13-rc1 drivers/pcmcia to see the diff between v2.6.12 and v2.6.13-rc1 as limited by the filename argument.
2005-06-17Use "-M" instead of "-C" for "git diff" and "git status"Libravatar Linus Torvalds1-3/+3
The "C" in "-C" may stand for "Cool", but it's also pretty slow, since right now it leaves all unmodified files to be tested even if there are no new files at all. That just ends up being unacceptably slow for big projects, especially if it's not all in the cache.
2005-06-17Don't use -C in "git diff"Libravatar Linus Torvalds1-3/+3
Right now it confuses at least git-diff-files, since it leaves all the files (whether changed or not) in the diff queue.
2005-06-14Trivial git script fixupsLibravatar Linus Torvalds1-3/+3
Fix permissions, and add trivial "reset" and "add" scripts. The "reset" script just resets the index back to head, while the "add" script is just a crutch for people used to do "cvs add".
2005-06-13Add "git diff" scriptLibravatar Linus Torvalds1-0/+16
It's a simple helper that depending on the arguments will either use git-diff-files, git-diff-cache or git-diff-tree.