aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* Merge branch 'sp/safecrlf'Junio C Hamano2008-02-16
|\
| * safecrlf: Add mechanism to warn about irreversible crlf conversionsSteffen Prohaska2008-02-06
* | Merge branch 'maint'Junio C Hamano2008-02-16
|\ \
| * | diff: Fix miscounting of --check outputJunio C Hamano2008-02-15
| * | diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver"Christian Couder2008-02-15
| * | diff.c: remove useless check for value != NULLChristian Couder2008-02-15
| * | diff.c: replace a 'strdup' with 'xstrdup'.Christian Couder2008-02-15
| * | diff.c: fixup garding of config parser from value=NULLJunio C Hamano2008-02-15
* | | Merge branch 'lt/in-core-index'Junio C Hamano2008-02-11
|\ \ \ | |/ / |/| |
| * | Avoid running lstat(2) on the same cache entry.Junio C Hamano2008-01-21
| |/
* | diff.c: guard config parser from value=NULLJunio C Hamano2008-02-11
|/
* color unchanged lines as "plain" in "diff --color-words"Jeff King2008-01-18
* Correct spelling in diff.c commentBill Lear2008-01-16
* diff: do not chomp hunk-header in the middle of a characterJunio C Hamano2008-01-06
* diff: remove lazy config loadingJeff King2008-01-04
* diff: load funcname patterns in "basic" configJeff King2008-01-04
* add a "basic" diff config callbackJeff King2008-01-04
* Fix rewrite_diff() name quoting.Junio C Hamano2007-12-26
* Teach diff machinery to display other prefixes than "a/" and "b/"Johannes Schindelin2007-12-20
* Support config variable diff.externalJohannes Schindelin2007-12-17
* Make "diff --check" output match "git apply"Wincent Colaiuta2007-12-13
* Unify whitespace checkingWincent Colaiuta2007-12-13
* diff --check: minor fixupsJunio C Hamano2007-12-13
* "diff --check" should affect exit statusWincent Colaiuta2007-12-13
* xdl_diff: identify call sites.Junio C Hamano2007-12-13
* Fix "diff --check" whitespace detectionWincent Colaiuta2007-12-12
* git-diff --numstat -z: make it machine readableJunio C Hamano2007-12-12
* Use "whitespace" consistentlyWincent Colaiuta2007-12-12
* Merge branch 'jc/spht'Junio C Hamano2007-12-09
|\
| * Use gitattributes to define per-path whitespace ruleJunio C Hamano2007-12-06
| * git-diff: complain about >=8 consecutive spaces in initial indentJunio C Hamano2007-11-02
| * War on whitespace: first, a bit of retreat.Junio C Hamano2007-11-02
* | git config --get-colorboolJunio C Hamano2007-12-05
* | Fix "quote" misconversion for rewrite diff output.Junio C Hamano2007-11-21
* | Reorder diff_opt_parse options more logically per topics.Pierre Habouzit2007-11-11
* | Make the diff_options bitfields be an unsigned with explicit masks.Pierre Habouzit2007-11-11
|/
* Merge branch 'js/forkexec'Junio C Hamano2007-11-01
|\
| * Use run_command() to spawn external diff programs instead of fork/exec.Johannes Sixt2007-10-21
* | copy vs rename detection: avoid unnecessary O(n*m) loopsLinus Torvalds2007-10-26
* | Ref-count the filespecs used by diffcoreLinus Torvalds2007-10-26
* | Correct some sizeof(size_t) != sizeof(unsigned long) typing errorsRené Scharfe2007-10-22
|/
* Merge branch 'ph/strbuf'Junio C Hamano2007-10-03
|\
| * strbuf change: be sure ->buf is never ever NULL.Pierre Habouzit2007-09-29
| * Full rework of quote_c_style and write_name_quoted.Pierre Habouzit2007-09-20
| * Use xmemdupz() in many places.Pierre Habouzit2007-09-18
| * Merge branch 'master' into ph/strbufJunio C Hamano2007-09-18
| |\
| * | Now that cache.h needs strbuf.h, remove useless includes.Pierre Habouzit2007-09-16
| * | Rewrite convert_to_{git,working_tree} to use strbuf's.Pierre Habouzit2007-09-16
| * | Strbuf API extensions and fixes.Pierre Habouzit2007-09-10
| * | Merge branch 'master' into ph/strbufJunio C Hamano2007-09-10
| |\ \