kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Johannes Schindelin	d75f7952ef	diff-options: add --stat (take 2) 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 <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	42efbf6d8a	git-diff: -p disables rename detection.	19 years ago
Junio C Hamano	f22fd75c6a	git-diff: do not fall back on --cc when -[123], --ours etc. are given. 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 <junkio@cox.net>	19 years ago
Junio C Hamano	df9892ffce	git-diff: use --cc instead of -p. The --cc output is much nicer when dealing with merges, so use it by default. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Fredrik Kuivinen	92811b5767	git-diff: Usage string clean-up Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	5620518095	git-diff: do not turn off -p/-M with any diff options. 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 <junkio@cox.net>	19 years ago
Junio C Hamano	d165fa14f0	define die() for scripts that use it. 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 <junkio@cox.net>	19 years ago
Linus Torvalds	ea51d416c0	Teach "git diff" to handle filenames starting with '-' 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 <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	9f92f15f89	Make 'git diff --cached' synonymous to 'git diff --cached HEAD'. When making changes to different files (i.e. dirty working tree) and committing logically separate changes in groups, often it is necessary to run 'git diff --cached HEAD' to make sure that the changes being committed makes sense. Saying 'git diff --cached' by mistake gives rather uninformative error message from git-diff-files complaining it does not understand --cached flag. Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
Junio C Hamano	215a7ad1ef	Big tool rename. 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>	20 years ago
Junio C Hamano	0a5a9ea433	Update git-diff-script. 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>	20 years ago
Junio C Hamano	792fe559d0	Fix "git-diff-script A B" 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>	20 years ago
Linus Torvalds	d288a70030	[PATCH] Make "git diff" work inside relative subdirectories 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>	20 years ago
Linus Torvalds	d1918a7285	Make "git diff" use git-sh-setup-script too.. Give a sane error rather than just silently claiming no diffs when you're not at the top-level directory.	20 years ago
Linus Torvalds	9e9824ba0e	Use the new git-rev-parse "--[no-]flags" in "git diff". 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.	20 years ago
Linus Torvalds	753fd78458	Use "-M" instead of "-C" for "git diff" and "git status" 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.	20 years ago
Linus Torvalds	aeac668125	Don't use -C in "git diff" Right now it confuses at least git-diff-files, since it leaves all the files (whether changed or not) in the diff queue.	20 years ago
Linus Torvalds	40d8cfe411	Trivial git script fixups 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".	20 years ago
Linus Torvalds	940c1bb018	Add "git diff" script It's a simple helper that depending on the arguments will either use git-diff-files, git-diff-cache or git-diff-tree.	20 years ago

11 Commits (8f2b72a93666afe63ab39b279bbd4088bd5463ca)