summaryrefslogtreecommitdiff
path: root/builtin-diff.c
AgeCommit message (Expand)AuthorFilesLines
2008-05-26Merge branch 'jc/diff-no-no-index'Libravatar Junio C Hamano1-10/+45
2008-05-24"git diff": do not ignore index without --no-indexLibravatar Junio C Hamano1-10/+45
2008-05-14Provide git_config with a callback-data parameterLibravatar Johannes Schindelin1-1/+1
2008-03-26Always set *nongit_ok in setup_git_directory_gently()Libravatar SZEDER Gábor1-1/+1
2008-02-27Merge branch 'jc/diff-relative'Libravatar Junio C Hamano1-1/+10
2008-02-18Add color.ui variable which globally enables colorization if setLibravatar Matthias Kestenholz1-0/+5
2008-02-13diff --relative: output paths as relative to the current subdirectoryLibravatar Junio C Hamano1-1/+10
2008-01-16Improve use of lockfile APILibravatar Brandon Casey1-1/+1
2007-12-13diff --check: minor fixupsLibravatar Junio C Hamano1-7/+4
2007-12-13"diff --check" should affect exit statusLibravatar Wincent Colaiuta1-2/+4
2007-12-11shortlog: default to HEAD when the standard input is a ttyLibravatar Junio C Hamano1-13/+1
2007-11-11Make the diff_options bitfields be an unsigned with explicit masks.Libravatar Pierre Habouzit1-6/+6
2007-11-08refresh_index_quietly(): express "optional" nature of index writing betterLibravatar Junio C Hamano1-9/+5
2007-08-31git-diff: resurrect the traditional empty "diff --git" behaviourLibravatar Junio C Hamano1-7/+27
2007-08-14git-diff: squelch "empty" diffsLibravatar Junio C Hamano1-0/+8
2007-08-13diff: don't run pager if user asked for a diff style exit codeLibravatar René Scharfe1-0/+6
2007-07-29git-diff: turn on recursion by defaultLibravatar Jeff King1-0/+1
2007-04-24Diff between two blobs should take mode changes into account now.Libravatar Junio C Hamano1-1/+1
2007-04-24use mode of the tree in git-diff, if <tree>:<file> syntax is usedLibravatar Martin Koegler1-6/+14
2007-04-22Support 'diff=pgm' attributeLibravatar Junio C Hamano1-0/+1
2007-03-14Allow git-diff exit with codes similar to diff(1)Libravatar Alex Riesen1-8/+11
2007-02-28diff: make more cases implicit --no-indexLibravatar Johannes Schindelin1-1/+4
2007-02-26Merge branch 'master' into js/diff-niLibravatar Junio C Hamano1-1/+4
2007-02-25diff --cached: give more sensible error message when HEAD is yet to be created.Libravatar Junio C Hamano1-0/+2
2007-02-24Evil Merge branch 'jc/status' (early part) into js/diff-niLibravatar Junio C Hamano1-0/+4
2007-02-22git-diff: fix combined diffLibravatar Johannes Schindelin1-1/+2
2007-02-22Teach git-diff-files the new option `--no-index`Libravatar Johannes Schindelin1-35/+3
2007-02-22run_diff_{files,index}(): update calling convention.Libravatar Junio C Hamano1-0/+8
2006-12-13Revert "git-diff: Introduce --index and deprecate --cached."Libravatar Junio C Hamano1-1/+1
2006-12-01git-diff: Introduce --index and deprecate --cached.Libravatar Andreas Ericsson1-1/+1
2006-08-23Convert memcpy(a,b,20) to hashcpy(a,b).Libravatar Shawn Pearce1-2/+2
2006-08-17Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.Libravatar David Rientjes1-1/+1
2006-08-15make inline is_null_sha1 globalLibravatar David Rientjes1-2/+1
2006-08-12Merge branch 'th/diff-extra'Libravatar Junio C Hamano1-7/+0
2006-08-10Fix git-diff A...BLibravatar Junio C Hamano1-0/+1
2006-08-09check return value from diff_setup_done()Libravatar Junio C Hamano1-1/+2
2006-08-03Fixup command names in some usage strings.Libravatar Ramsay Allan Jones1-1/+1
2006-08-03Show both blob names from "git diff blob1 blob2"Libravatar Junio C Hamano1-1/+1
2006-08-03Fix "git diff blob1 blob2" showing the diff in reverse.Libravatar Junio C Hamano1-4/+1
2006-07-29Call setup_git_directory() much earlierLibravatar Linus Torvalds1-3/+2
2006-07-28Call setup_git_directory() earlyLibravatar Linus Torvalds1-3/+3
2006-07-28Merge branch 'jc/diff'Libravatar Junio C Hamano1-1/+9
2006-07-27log and diff family: honor config even from subdirectoriesLibravatar Junio C Hamano1-1/+2
2006-07-17git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B"Libravatar Junio C Hamano1-1/+9
2006-07-12Remove TYPE_* constant macros and use object_type enums consistently.Libravatar Linus Torvalds1-3/+3
2006-07-10Fix more typos, primarily in the codeLibravatar Pavel Roskin1-1/+1
2006-07-08diff: do not use configuration magic at the core-levelLibravatar Junio C Hamano1-1/+1
2006-07-01Remove awkward compatibility wartsLibravatar Timo Hirvonen1-7/+0
2006-07-01builtin-diff: turn recursive on when defaulting to --patch format.Libravatar Junio C Hamano1-1/+3
2006-06-26Set default diff output format after parsing command lineLibravatar Timo Hirvonen1-1/+3