aboutsummaryrefslogtreecommitdiffstats
path: root/builtin-diff.c
AgeCommit message (Expand)AuthorFilesLines
2008-12-07reorder ALLOW_TEXTCONV option settingJeff King1-2/+2
2008-11-27Merge branch 'lt/preload-lstat'Junio C Hamano1-4/+4
2008-11-26Merge branch 'maint'Junio C Hamano1-1/+4
2008-11-26Teach "git diff" to honour --[no-]ext-diffJunio C Hamano1-1/+4
2008-11-14Add cache preload facilityLinus Torvalds1-4/+4
2008-11-12Merge branch 'jk/diff-convfilter'Junio C Hamano1-0/+1
2008-11-11git-diff: Add --staged as a synonym for --cached.David Symonds1-2/+3
2008-10-26userdiff: require explicitly allowing textconvJeff King1-0/+1
2008-10-12"git diff <tree>{3,}": do not reverse order of argumentsMatt McCutchen1-3/+1
2008-09-18Merge branch 'maint'Junio C Hamano1-1/+7
2008-09-18Merge branch 'jc/diff-prefix'Junio C Hamano1-0/+2
2008-09-18diff/diff-files: do not use --cc too aggressivelyJunio C Hamano1-1/+7
2008-08-30diff: vary default prefix depending on what are comparedJunio C Hamano1-0/+2
2008-08-28diff*: fix worktree setupNguyễn Thái Ngọc Duy1-0/+3
2008-07-23Allow pager of diff command be enabled/disabledAlex Riesen1-1/+2
2008-07-13Make usage strings dash-lessStephan Beyer1-1/+1
2008-05-26Merge branch 'jc/diff-no-no-index'Junio C Hamano1-10/+45
2008-05-24"git diff": do not ignore index without --no-indexJunio C Hamano1-10/+45
2008-05-14Provide git_config with a callback-data parameterJohannes Schindelin1-1/+1
2008-03-26Always set *nongit_ok in setup_git_directory_gently()SZEDER Gábor1-1/+1
2008-02-27Merge branch 'jc/diff-relative'Junio C Hamano1-1/+10
2008-02-18Add color.ui variable which globally enables colorization if setMatthias Kestenholz1-0/+5
2008-02-13diff --relative: output paths as relative to the current subdirectoryJunio C Hamano1-1/+10
2008-01-16Improve use of lockfile APIBrandon Casey1-1/+1
2007-12-13diff --check: minor fixupsJunio C Hamano1-7/+4
2007-12-13"diff --check" should affect exit statusWincent Colaiuta1-2/+4
2007-12-11shortlog: default to HEAD when the standard input is a ttyJunio C Hamano1-13/+1
2007-11-11Make the diff_options bitfields be an unsigned with explicit masks.Pierre Habouzit1-6/+6
2007-11-08refresh_index_quietly(): express "optional" nature of index writing betterJunio C Hamano1-9/+5
2007-08-31git-diff: resurrect the traditional empty "diff --git" behaviourJunio C Hamano1-7/+27
2007-08-14git-diff: squelch "empty" diffsJunio C Hamano1-0/+8
2007-08-13diff: don't run pager if user asked for a diff style exit codeRené Scharfe1-0/+6
2007-07-29git-diff: turn on recursion by defaultJeff King1-0/+1
2007-04-24Diff between two blobs should take mode changes into account now.Junio C Hamano1-1/+1
2007-04-24use mode of the tree in git-diff, if <tree>:<file> syntax is usedMartin Koegler1-6/+14
2007-04-22Support 'diff=pgm' attributeJunio C Hamano1-0/+1
2007-03-14Allow git-diff exit with codes similar to diff(1)Alex Riesen1-8/+11
2007-02-28diff: make more cases implicit --no-indexJohannes Schindelin1-1/+4
2007-02-26Merge branch 'master' into js/diff-niJunio C Hamano1-1/+4
2007-02-25diff --cached: give more sensible error message when HEAD is yet to be created.Junio C Hamano1-0/+2
2007-02-24Evil Merge branch 'jc/status' (early part) into js/diff-niJunio C Hamano1-0/+4
2007-02-22git-diff: fix combined diffJohannes Schindelin1-1/+2
2007-02-22Teach git-diff-files the new option `--no-index`Johannes Schindelin1-35/+3
2007-02-22run_diff_{files,index}(): update calling convention.Junio C Hamano1-0/+8
2006-12-13Revert "git-diff: Introduce --index and deprecate --cached."Junio C Hamano1-1/+1
2006-12-01git-diff: Introduce --index and deprecate --cached.Andreas Ericsson1-1/+1
2006-08-23Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce1-2/+2
2006-08-17Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes1-1/+1
2006-08-15make inline is_null_sha1 globalDavid Rientjes1-2/+1
2006-08-12Merge branch 'th/diff-extra'Junio C Hamano1-7/+0
2006-08-10Fix git-diff A...BJunio C Hamano1-0/+1
2006-08-09check return value from diff_setup_done()Junio C Hamano1-1/+2
2006-08-03Fixup command names in some usage strings.Ramsay Allan Jones1-1/+1
2006-08-03Show both blob names from "git diff blob1 blob2"Junio C Hamano1-1/+1
2006-08-03Fix "git diff blob1 blob2" showing the diff in reverse.Junio C Hamano1-4/+1
2006-07-29Call setup_git_directory() much earlierLinus Torvalds1-3/+2
2006-07-28Call setup_git_directory() earlyLinus Torvalds1-3/+3
2006-07-28Merge branch 'jc/diff'Junio C Hamano1-1/+9
2006-07-27log and diff family: honor config even from subdirectoriesJunio C Hamano1-1/+2
2006-07-17git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B"Junio C Hamano1-1/+9
2006-07-12Remove TYPE_* constant macros and use object_type enums consistently.Linus Torvalds1-3/+3
2006-07-10Fix more typos, primarily in the codePavel Roskin1-1/+1
2006-07-08diff: do not use configuration magic at the core-levelJunio C Hamano1-1/+1
2006-07-01Remove awkward compatibility wartsTimo Hirvonen1-7/+0
2006-07-01builtin-diff: turn recursive on when defaulting to --patch format.Junio C Hamano1-1/+3
2006-06-26Set default diff output format after parsing command lineTimo Hirvonen1-1/+3
2006-06-26Make --raw option available for all diff commandsTimo Hirvonen1-36/+12
2006-06-26Merge with_raw, with_stat and summary variables to output_formatTimo Hirvonen1-1/+1
2006-06-19Add "named object array" conceptLinus Torvalds1-12/+14
2006-06-17Shrink "struct object" a bitLinus Torvalds1-3/+3
2006-05-21Merge branch 'master' into js/fmt-patchJunio C Hamano1-6/+7
2006-05-18builtin-diff: do not say files are renamed when blob and file are givenJunio C Hamano1-1/+1
2006-05-15builtin-diff: fix comparison between two blobs.Junio C Hamano1-3/+5
2006-05-07Sparse fix for builtin-diffPeter Hagervall1-2/+1
2006-05-06fmt-patch: understand old <his> notationJohannes Schindelin1-1/+1
2006-05-03Merge branch 'jc/diff'Junio C Hamano1-0/+369
2006-04-30builtin-diff.c: die() formatting type fix.Junio C Hamano1-1/+1
2006-04-29built-in diff: assorted updates.Junio C Hamano1-9/+46
2006-04-28built-in diff.Junio C Hamano1-0/+332