summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2007-02-28Merge branch 'np/types'Libravatar Junio C Hamano1-3/+4
2007-02-27convert object type handling from a string to a numberLibravatar Nicolas Pitre1-3/+4
2007-02-26diff --no-index: also imitate the exit status of diff(1)Libravatar Johannes Schindelin1-0/+6
2007-02-26Merge branch 'master' into js/diff-niLibravatar Junio C Hamano1-51/+100
2007-02-24Merge branch 'maint'Libravatar Junio C Hamano1-2/+4
2007-02-24diff-patch: Avoid emitting double-slashes in textual patch.Libravatar Junio C Hamano1-2/+4
2007-02-22Merge branches 'lt/crlf' and 'jc/apply-config'Libravatar Junio C Hamano1-1/+16
2007-02-22Teach git-diff-files the new option `--no-index`Libravatar Johannes Schindelin1-1/+2
2007-02-21Teach diff -B about coloursLibravatar Johannes Schindelin1-14/+25
2007-02-20prefixcmp(): fix-up leftover strncmp().Libravatar Junio C Hamano1-1/+1
2007-02-20Mechanical conversion to use prefixcmp()Libravatar Junio C Hamano1-15/+15
2007-02-19Merge branch 'js/diff-color-check'Libravatar Junio C Hamano1-18/+39
2007-02-18diff --check: use colourLibravatar Johannes Schindelin1-18/+39
2007-02-14Lazy man's auto-CRLFLibravatar Linus Torvalds1-1/+16
2007-02-13teach diff machinery about --ignore-space-at-eolLibravatar Johannes Schindelin1-0/+2
2007-02-13Merge branch 'jc/diff-apply-patch'Libravatar Junio C Hamano1-3/+17
2007-02-13Mark places that need blob munging later for CRLF conversion.Libravatar Linus Torvalds1-0/+1
2007-02-11diff.c: More logical file name quoting for renames in diffstat.Libravatar Alexandre Julliard1-7/+27
2007-02-11diff.c: Properly quote file names in diff --summary output.Libravatar Alexandre Julliard1-5/+12
2007-02-11diff.c: Reuse the pprint_rename function for diff --summary output.Libravatar Alexandre Julliard1-27/+4
2007-02-09diff_flush_name(): take struct diff_options parameter.Libravatar Junio C Hamano1-4/+4
2007-01-08short i/o: fix calls to write to use xwrite or write_in_fullLibravatar Andy Whitcroft1-1/+1
2007-01-07Merge branch 'sp/mmap'Libravatar Junio C Hamano1-3/+1
2007-01-06diff-index --cached --raw: show tree entry on the LHS for unmerged entries.Libravatar Junio C Hamano1-2/+4
2006-12-29Replace mmap with xmmap, better handling MAP_FAILED.Libravatar Shawn O. Pearce1-3/+1
2006-12-21Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
2006-12-21diff --check: fix off by one errorLibravatar Johannes Schindelin1-2/+2
2006-12-20simplify inclusion of system header files.Libravatar Junio C Hamano1-3/+0
2006-12-19fix populate-filespecLibravatar Junio C Hamano1-1/+1
2006-12-15make commit message a little more consistent and confortingLibravatar Nicolas Pitre1-1/+37
2006-12-15Avoid accessing a slow working copy during diffcore operations.Libravatar Shawn O. Pearce1-3/+21
2006-12-13Merge branch 'jc/numstat'Libravatar Junio C Hamano1-1/+4
2006-12-13Allow subcommand.color and color.subcommand color configurationLibravatar Andy Parkins1-2/+2
2006-12-11diff --numstat: show binary with '-' to match "apply --numstat"Libravatar Junio C Hamano1-1/+4
2006-11-21git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2)Libravatar Junio C Hamano1-3/+17
2006-10-18Merge branch 'js/diff'Libravatar Junio C Hamano1-0/+1
2006-10-13diff --numstatLibravatar Junio C Hamano1-2/+27
2006-10-05Turn on recursive with --summaryLibravatar Johannes Schindelin1-0/+1
2006-09-30Merge branch 'jc/diff-stat'Libravatar Junio C Hamano1-41/+125
2006-09-29git-diff -B output fix.Libravatar Junio C Hamano1-1/+1
2006-09-28diff --stat: ensure at least one '-' for deletions, and one '+' for additionsLibravatar Johannes Schindelin1-4/+7
2006-09-28diff --stat=width[,name-width]: allow custom diffstat output width.Libravatar Linus Torvalds1-8/+25
2006-09-27diff --stat: color output.Libravatar Junio C Hamano1-10/+19
2006-09-27diff --stat: allow custom diffstat output width.Libravatar Junio C Hamano1-38/+93
2006-09-24diff.c: second war on whitespace.Libravatar Junio C Hamano1-41/+131
2006-09-17Merge branch 'jk/diff'Libravatar Junio C Hamano1-132/+7
2006-09-08Move color option parsing out of diff.c and into color.[ch]Libravatar Jeff King1-132/+4
2006-09-07diff: support custom callbacks for outputLibravatar Jeff King1-0/+3
2006-09-07diff --binary generates full index on binary files.Libravatar Junio C Hamano1-1/+7
2006-09-02Replace uses of strdup with xstrdup.Libravatar Shawn Pearce1-2/+2