aboutsummaryrefslogtreecommitdiff
path: root/builtin-diff.c
Commit message (Collapse)AuthorAge
* Merge branch 'master' into js/fmt-patchJunio C Hamano2006-05-21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (119 commits) diff family: add --check option Document that "git add" only adds non-ignored files. Add a conversion tool to migrate remote information into the config fetch, pull: ask config for remote information Fix build procedure for builtin-init-db read-tree -m -u: do not overwrite or remove untracked working tree files. apply --cached: do not check newly added file in the working tree Implement a --dry-run option to git-quiltimport Implement git-quiltimport Revert "builtin-grep: workaround for non GNU grep." builtin-grep: workaround for non GNU grep. builtin-grep: workaround for non GNU grep. git-am: use apply --cached apply --cached: apply a patch without using working tree. apply --numstat: show new name, not old name. Documentation/Makefile: create tarballs for the man pages and html files Allow pickaxe and diff-filter options to be used by git log. Libify the index refresh logic Builtin git-init-db Remove unnecessary local in get_ref_sha1. ...
| * builtin-diff: do not say files are renamed when blob and file are givenJunio C Hamano2006-05-18
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * builtin-diff: fix comparison between two blobs.Junio C Hamano2006-05-15
| | | | | | | | | | | | | | The code forgot that setup_revisions() leaves parsed object names in reverse in the list. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Sparse fix for builtin-diffPeter Hagervall2006-05-07
| | | | | | | | | | | | | | | | | | You gotta love sparse: builtin-diff.c:88:4: error: Just how const do you want this type to be? Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | fmt-patch: understand old <his> notationJohannes Schindelin2006-05-06
|/ | | | | | | | | When calling "git fmt-patch HEAD~5", you now get the same as if you would have said "git fmt-patch HEAD~5..". This makes it easier for my fingers which are so used to the old syntax. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'jc/diff'Junio C Hamano2006-05-03
| | | | | | | | * jc/diff: builtin-diff: call it "git-diff", really. builtin-diff.c: die() formatting type fix. built-in diff: assorted updates. built-in diff.
* builtin-diff.c: die() formatting type fix.Junio C Hamano2006-04-30
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* built-in diff: assorted updates.Junio C Hamano2006-04-29
| | | | | | | | | | | | | | | | "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>
* built-in diff.Junio C Hamano2006-04-28
This starts to replace the shell script version of "git diff". Signed-off-by: Junio C Hamano <junkio@cox.net>