summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/spht'Junio C Hamano2007-12-091-11/+29
|\
| * Use gitattributes to define per-path whitespace ruleJunio C Hamano2007-12-061-7/+12
| * git-diff: complain about >=8 consecutive spaces in initial indentJunio C Hamano2007-11-021-2/+12
| * War on whitespace: first, a bit of retreat.Junio C Hamano2007-11-021-5/+8
* | git config --get-colorboolJunio C Hamano2007-12-051-1/+1
* | Fix "quote" misconversion for rewrite diff output.Junio C Hamano2007-11-211-1/+1
* | Reorder diff_opt_parse options more logically per topics.Pierre Habouzit2007-11-111-53/+63
* | Make the diff_options bitfields be an unsigned with explicit masks.Pierre Habouzit2007-11-111-63/+60
|/
* Merge branch 'js/forkexec'Junio C Hamano2007-11-011-35/+3
|\
| * Use run_command() to spawn external diff programs instead of fork/exec.Johannes Sixt2007-10-211-35/+3
* | copy vs rename detection: avoid unnecessary O(n*m) loopsLinus Torvalds2007-10-261-23/+17
* | Ref-count the filespecs used by diffcoreLinus Torvalds2007-10-261-4/+11
* | Correct some sizeof(size_t) != sizeof(unsigned long) typing errorsRené Scharfe2007-10-221-2/+6
|/
* Merge branch 'ph/strbuf'Junio C Hamano2007-10-031-229/+123
|\
| * strbuf change: be sure ->buf is never ever NULL.Pierre Habouzit2007-09-291-8/+6
| * Full rework of quote_c_style and write_name_quoted.Pierre Habouzit2007-09-201-193/+110
| * Use xmemdupz() in many places.Pierre Habouzit2007-09-181-11/+2
| * Merge branch 'master' into ph/strbufJunio C Hamano2007-09-181-1/+1
| |\
| * | Now that cache.h needs strbuf.h, remove useless includes.Pierre Habouzit2007-09-161-1/+0
| * | Rewrite convert_to_{git,working_tree} to use strbuf's.Pierre Habouzit2007-09-161-7/+5
| * | Strbuf API extensions and fixes.Pierre Habouzit2007-09-101-2/+2
| * | Merge branch 'master' into ph/strbufJunio C Hamano2007-09-101-4/+17
| |\ \
| * | | Use strbuf API in apply, blame, commit-tree and diffPierre Habouzit2007-09-061-18/+9
* | | | rename diff_free_filespec_data_large() to diff_free_filespec_blob()Junio C Hamano2007-10-021-2/+2
* | | | diffcore-rename: cache file deltasJeff King2007-10-021-1/+6
| |_|/ |/| |
* | | Fix the rename detection limit checkingLinus Torvalds2007-09-141-1/+1
| |/ |/|
* | git-diff: don't squelch the new SHA1 in submodule diffsSven Verdoolaege2007-09-091-4/+17
|/
* git-diff: resurrect the traditional empty "diff --git" behaviourJunio C Hamano2007-08-311-0/+5
* Take binary diffs into account for "git rebase"Linus Torvalds2007-08-191-4/+0
* diff: squelch empty diffs even moreRené Scharfe2007-08-141-1/+2
* git-diff: squelch "empty" diffsJunio C Hamano2007-08-141-0/+52
* git_mkstemp(): be careful not to overflow the path buffer.Junio C Hamano2007-07-251-1/+1
* diff.c: make built-in hunk header pattern a separate tableJunio C Hamano2007-07-081-6/+16
* diff: honor binariness specified in attributesJunio C Hamano2007-07-071-5/+9
* Fix configuration syntax to specify customized hunk header patterns.Junio C Hamano2007-07-071-67/+80
* Per-path attribute based hunk header selection.Junio C Hamano2007-07-061-1/+95
* Future-proof source for changes in xdemitconf_tJohannes Schindelin2007-07-061-5/+5
* Introduce diff_filespec_is_binary()Junio C Hamano2007-07-061-35/+36
* Merge branch 'maint'Junio C Hamano2007-07-031-1/+2
|\
| * diff --no-index: fix --name-status with added filesJohannes Schindelin2007-07-031-1/+2
| * Move buffer_is_binary() to xdiff-interface.hJohannes Schindelin2007-06-151-6/+1
* | Add diff-option --ext-diffJohannes Schindelin2007-07-031-0/+4
* | Merge branch 'jc/diffcore'Junio C Hamano2007-07-021-0/+16
|\ \
| * | diffcore_filespec: add is_binaryJunio C Hamano2007-06-301-0/+16
* | | diff: round down similarity indexRené Scharfe2007-06-251-11/+11
|/ /
* | Finally implement "git log --follow"Linus Torvalds2007-06-221-0/+2
* | Teach diff to imply --find-copies-harder upon -C -CJohannes Schindelin2007-06-121-0/+2
* | Even more missing staticJunio C Hamano2007-06-081-1/+3
* | War on whitespaceJunio C Hamano2007-06-071-2/+2
* | Move buffer_is_binary() to xdiff-interface.hJohannes Schindelin2007-06-041-6/+1
View Lorry Controller Status