aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* Merge branch 'mp/diff-algo-config'Junio C Hamano2013-02-17
|\
| * diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-16
| * config: Introduce diff.algorithm variableMichal Privoznik2013-01-16
* | Merge branch 'jk/diff-graph-cleanup'Junio C Hamano2013-02-14
|\ \
| * | diff.c: use diff_line_prefix() where applicableJohn Keeping2013-02-12
| * | diff: add diff_line_prefix functionJohn Keeping2013-02-12
| * | diff.c: make constant string arguments constJohn Keeping2013-02-12
| * | diff: write prefix to the correct fileJohn Keeping2013-02-12
| |/
* | Merge branch 'jc/blame-no-follow'Junio C Hamano2013-01-14
|\ \ | |/ |/|
| * diff: accept --no-follow optionJunio C Hamano2012-09-21
* | Merge branch 'lt/diff-stat-show-0-lines'Junio C Hamano2012-11-29
|\ \
| * | diff --shortstat: do not count "unmerged" entriesJunio C Hamano2012-11-27
| * | diff --stat: do not count "unmerged" entriesJunio C Hamano2012-11-27
| * | diff --stat: move the "total count" logic to the last loopJunio C Hamano2012-11-27
| * | diff --stat: use "file" temporary variable to refer to data->files[i]Junio C Hamano2012-11-27
| * | diff --stat: status of unmodified pair in diff-q is not zeroJunio C Hamano2012-11-27
* | | Merge branch 'rr/submodule-diff-config'Junio C Hamano2012-11-25
|\ \ \
| * | | submodule: display summary header in boldRamkumar Ramachandra2012-11-18
| * | | diff: rename "set" variableJeff King2012-11-18
| * | | diff: introduce diff.submodule configuration variableRamkumar Ramachandra2012-11-18
* | | | Merge branch 'lt/diff-stat-show-0-lines'Junio C Hamano2012-11-25
|\ \ \ \ | | |/ / | |/| |
| * | | Fix "git diff --stat" for interesting - but empty - file changesLinus Torvalds2012-10-17
* | | | Merge branch 'nd/builtin-to-libgit'Jeff King2012-11-09
|\ \ \ \
| * | | | Move setup_diff_pager to libgit.aNguyễn Thái Ngọc Duy2012-10-29
| | |/ / | |/| |
* | | | Merge branch 'mh/maint-parse-dirstat-fix'Jeff King2012-11-09
|\ \ \ \ | |/ / / |/| | |
| * | | parse_dirstat_params(): use string_list to split comma-separated stringMichael Haggerty2012-10-29
| * | | Merge branch 'nd/maint-diffstat-summary' into maintJunio C Hamano2012-09-20
| |\ \ \
| * \ \ \ Sync with 1.7.11.6Junio C Hamano2012-09-11
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \
| | * \ \ \ Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-10
| | |\ \ \ \ \
* | | | | | | | diff: diff.context configuration gives default to -UJeff Muizelaar2012-09-30
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'jc/make-static'Junio C Hamano2012-09-18
|\ \ \ \ \ \ \
| * | | | | | | diff.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-15
* | | | | | | | Merge branch 'nd/maint-diffstat-summary'Junio C Hamano2012-09-17
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Revert diffstat back to EnglishNguyễn Thái Ngọc Duy2012-09-14
| |/ / / / /
* | | | | | Merge branch 'ab/diff-write-incomplete-line'Junio C Hamano2012-08-27
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Fix '\ No newline...' annotation in rewrite diffsAdam Butcher2012-08-05
| | |/ / / | |/| | |
| * | | | Merge branch 'jv/maint-no-ext-diff' into maintJunio C Hamano2012-07-30
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/refactor-diff-stdin' into maintJunio C Hamano2012-07-22
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jk/maint-null-in-trees'Junio C Hamano2012-08-27
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | diff: do not use null sha1 as a sentinel valueJeff King2012-07-29
* | | | | | | Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-22
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | diff_setup_done(): return voidThomas Rast2012-08-03
| |/ / / /
* | | | | Merge branch 'nd/maint-i18n-diffstat'Junio C Hamano2012-07-31
|\ \ \ \ \
| * | | | | i18n: leave \n out of translated diffstatNguyễn Thái Ngọc Duy2012-07-26
* | | | | | Merge branch 'jv/maint-no-ext-diff'Junio C Hamano2012-07-23
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | diff: correctly disable external_diff with --no-ext-diffJunio C Hamano2012-07-17
| | |/ / / | |/| | |
* | | | | Merge branch 'jc/refactor-diff-stdin'Junio C Hamano2012-07-13
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-05 20:21:31 +0000