kernel/git - git - PowerEL Git System

4360 Commits

6 Branches

36 Tags

131 MiB

Tree: 83e77a25dc

Commit Graph

Author	SHA1	Message	Date
Junio C Hamano	334b506a34	builtin-diff.c: die() formatting type fix. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	0fe7c1de16	built-in diff: assorted updates. "git diff(n)" without --base, --ours, etc. defaults to --cc, which usually is the same as -p unless you are in the middle of a conflicted merge, just like the shell script version. "git diff(n) blobA blobB path" complains and dies. "git diff(n) tree0 tree1 tree2...treeN" does combined diff that shows a merge of tree1..treeN to result in tree0. Giving "-c" option to any command that defaults to "--cc" turns off dense-combined flag. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	65056021f2	built-in diff. This starts to replace the shell script version of "git diff". Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago

Author

SHA1

Message

Date

Junio C Hamano

334b506a34

builtin-diff.c: die() formatting type fix.

Signed-off-by: Junio C Hamano <junkio@cox.net>

19 years ago

Junio C Hamano

0fe7c1de16

built-in diff: assorted updates.

"git diff(n)" without --base, --ours, etc. defaults to --cc,
which usually is the same as -p unless you are in the middle of
a conflicted merge, just like the shell script version.

"git diff(n) blobA blobB path" complains and dies.

"git diff(n) tree0 tree1 tree2...treeN" does combined diff that
shows a merge of tree1..treeN to result in tree0.

Giving "-c" option to any command that defaults to "--cc" turns
off dense-combined flag.

Signed-off-by: Junio C Hamano <junkio@cox.net>

19 years ago

Junio C Hamano

65056021f2

built-in diff.

This starts to replace the shell script version of "git diff".

Signed-off-by: Junio C Hamano <junkio@cox.net>

19 years ago

4 Commits (83e77a25dc194933c0fb7908ab6d9fb84a5045e2)