aboutsummaryrefslogtreecommitdiff
path: root/builtin-diff.c
Commit message (Expand)AuthorAge
* Merge branch 'maint'Junio C Hamano2008-11-26
|\
| * Teach "git diff" to honour --[no-]ext-diffJunio C Hamano2008-11-26
* | Merge branch 'jk/diff-convfilter'Junio C Hamano2008-11-12
|\ \
| * | userdiff: require explicitly allowing textconvJeff King2008-10-26
* | | git-diff: Add --staged as a synonym for --cached.David Symonds2008-11-11
|/ /
* | "git diff <tree>{3,}": do not reverse order of argumentsMatt McCutchen2008-10-12
* | Merge branch 'maint'Junio C Hamano2008-09-18
|\ \ | |/
| * diff/diff-files: do not use --cc too aggressivelyJunio C Hamano2008-09-18
* | Merge branch 'jc/diff-prefix'Junio C Hamano2008-09-18
|\ \ | |/ |/|
| * diff: vary default prefix depending on what are comparedJunio C Hamano2008-08-30
* | diff*: fix worktree setupNguyễn Thái Ngọc Duy2008-08-28
|/
* Allow pager of diff command be enabled/disabledAlex Riesen2008-07-23
* Make usage strings dash-lessStephan Beyer2008-07-13
* Merge branch 'jc/diff-no-no-index'Junio C Hamano2008-05-26
|\
| * "git diff": do not ignore index without --no-indexJunio C Hamano2008-05-24
* | Provide git_config with a callback-data parameterJohannes Schindelin2008-05-14
|/
* Always set *nongit_ok in setup_git_directory_gently()SZEDER Gábor2008-03-26
* Merge branch 'jc/diff-relative'Junio C Hamano2008-02-27
|\
| * diff --relative: output paths as relative to the current subdirectoryJunio C Hamano2008-02-13
* | Add color.ui variable which globally enables colorization if setMatthias Kestenholz2008-02-18
|/
* Improve use of lockfile APIBrandon Casey2008-01-16
* diff --check: minor fixupsJunio C Hamano2007-12-13
* "diff --check" should affect exit statusWincent Colaiuta2007-12-13
* shortlog: default to HEAD when the standard input is a ttyJunio C Hamano2007-12-11
* Make the diff_options bitfields be an unsigned with explicit masks.Pierre Habouzit2007-11-11
* refresh_index_quietly(): express "optional" nature of index writing betterJunio C Hamano2007-11-08
* git-diff: resurrect the traditional empty "diff --git" behaviourJunio C Hamano2007-08-31
* git-diff: squelch "empty" diffsJunio C Hamano2007-08-14
* diff: don't run pager if user asked for a diff style exit codeRené Scharfe2007-08-13
* git-diff: turn on recursion by defaultJeff King2007-07-29
* Diff between two blobs should take mode changes into account now.Junio C Hamano2007-04-24
* use mode of the tree in git-diff, if <tree>:<file> syntax is usedMartin Koegler2007-04-24
* Support 'diff=pgm' attributeJunio C Hamano2007-04-22
* Allow git-diff exit with codes similar to diff(1)Alex Riesen2007-03-14
* diff: make more cases implicit --no-indexJohannes Schindelin2007-02-28
* Merge branch 'master' into js/diff-niJunio C Hamano2007-02-26
|\
| * diff --cached: give more sensible error message when HEAD is yet to be created.Junio C Hamano2007-02-25
| * git-diff: fix combined diffJohannes Schindelin2007-02-22
* | Evil Merge branch 'jc/status' (early part) into js/diff-niJunio C Hamano2007-02-24
|\ \
| * | run_diff_{files,index}(): update calling convention.Junio C Hamano2007-02-22
| |/
* | Teach git-diff-files the new option `--no-index`Johannes Schindelin2007-02-22
|/
* Revert "git-diff: Introduce --index and deprecate --cached."Junio C Hamano2006-12-13
* git-diff: Introduce --index and deprecate --cached.Andreas Ericsson2006-12-01
* Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce2006-08-23
* Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes2006-08-17
* make inline is_null_sha1 globalDavid Rientjes2006-08-15
* Merge branch 'th/diff-extra'Junio C Hamano2006-08-12
|\
| * Remove awkward compatibility wartsTimo Hirvonen2006-07-01
* | Fix git-diff A...BJunio C Hamano2006-08-10
* | check return value from diff_setup_done()Junio C Hamano2006-08-09