summaryrefslogtreecommitdiff
path: root/builtin-diff.c
Commit message (Expand)AuthorAgeFilesLines
* Show usage string for 'git log -h', 'git show -h' and 'git diff -h'Matthieu Moy2009-08-071-0/+2
* Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast2009-06-271-1/+1
* reorder ALLOW_TEXTCONV option settingJeff King2008-12-071-2/+2
* Merge branch 'lt/preload-lstat'Junio C Hamano2008-11-271-4/+4
|\
| * Add cache preload facilityLinus Torvalds2008-11-141-4/+4
* | Merge branch 'maint'Junio C Hamano2008-11-261-1/+4
|\ \ | |/ |/|
| * Teach "git diff" to honour --[no-]ext-diffJunio C Hamano2008-11-261-1/+4
* | Merge branch 'jk/diff-convfilter'Junio C Hamano2008-11-121-0/+1
|\ \
| * | userdiff: require explicitly allowing textconvJeff King2008-10-261-0/+1
* | | git-diff: Add --staged as a synonym for --cached.David Symonds2008-11-111-2/+3
|/ /
* | "git diff <tree>{3,}": do not reverse order of argumentsMatt McCutchen2008-10-121-3/+1
* | Merge branch 'maint'Junio C Hamano2008-09-181-1/+7
|\ \ | |/
| * diff/diff-files: do not use --cc too aggressivelyJunio C Hamano2008-09-181-1/+7
* | Merge branch 'jc/diff-prefix'Junio C Hamano2008-09-181-0/+2
|\ \ | |/ |/|
| * diff: vary default prefix depending on what are comparedJunio C Hamano2008-08-301-0/+2
* | diff*: fix worktree setupNguyễn Thái Ngọc Duy2008-08-281-0/+3
|/
* Allow pager of diff command be enabled/disabledAlex Riesen2008-07-231-1/+2
* Make usage strings dash-lessStephan Beyer2008-07-131-1/+1
* Merge branch 'jc/diff-no-no-index'Junio C Hamano2008-05-261-10/+45
|\
| * "git diff": do not ignore index without --no-indexJunio C Hamano2008-05-241-10/+45
* | Provide git_config with a callback-data parameterJohannes Schindelin2008-05-141-1/+1
|/
* Always set *nongit_ok in setup_git_directory_gently()SZEDER Gábor2008-03-261-1/+1
* Merge branch 'jc/diff-relative'Junio C Hamano2008-02-271-1/+10
|\
| * diff --relative: output paths as relative to the current subdirectoryJunio C Hamano2008-02-131-1/+10
* | Add color.ui variable which globally enables colorization if setMatthias Kestenholz2008-02-181-0/+5
|/
* Improve use of lockfile APIBrandon Casey2008-01-161-1/+1
* diff --check: minor fixupsJunio C Hamano2007-12-131-7/+4
* "diff --check" should affect exit statusWincent Colaiuta2007-12-131-2/+4
* shortlog: default to HEAD when the standard input is a ttyJunio C Hamano2007-12-111-13/+1
* Make the diff_options bitfields be an unsigned with explicit masks.Pierre Habouzit2007-11-111-6/+6
* refresh_index_quietly(): express "optional" nature of index writing betterJunio C Hamano2007-11-081-9/+5
* git-diff: resurrect the traditional empty "diff --git" behaviourJunio C Hamano2007-08-311-7/+27
* git-diff: squelch "empty" diffsJunio C Hamano2007-08-141-0/+8
* diff: don't run pager if user asked for a diff style exit codeRené Scharfe2007-08-131-0/+6
* git-diff: turn on recursion by defaultJeff King2007-07-291-0/+1
* Diff between two blobs should take mode changes into account now.Junio C Hamano2007-04-241-1/+1
* use mode of the tree in git-diff, if <tree>:<file> syntax is usedMartin Koegler2007-04-241-6/+14
* Support 'diff=pgm' attributeJunio C Hamano2007-04-221-0/+1
* Allow git-diff exit with codes similar to diff(1)Alex Riesen2007-03-141-8/+11
* diff: make more cases implicit --no-indexJohannes Schindelin2007-02-281-1/+4
* Merge branch 'master' into js/diff-niJunio C Hamano2007-02-261-1/+4
|\
| * diff --cached: give more sensible error message when HEAD is yet to be created.Junio C Hamano2007-02-251-0/+2
| * git-diff: fix combined diffJohannes Schindelin2007-02-221-1/+2
* | Evil Merge branch 'jc/status' (early part) into js/diff-niJunio C Hamano2007-02-241-0/+4
|\ \
| * | run_diff_{files,index}(): update calling convention.Junio C Hamano2007-02-221-0/+8
| |/
* | Teach git-diff-files the new option `--no-index`Johannes Schindelin2007-02-221-35/+3
|/
* Revert "git-diff: Introduce --index and deprecate --cached."Junio C Hamano2006-12-131-1/+1
* git-diff: Introduce --index and deprecate --cached.Andreas Ericsson2006-12-011-1/+1
* Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce2006-08-231-2/+2
* Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes2006-08-171-1/+1
View Lorry Controller Status