summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ap/maint-diff-rename-avoid-overlap'Junio C Hamano2013-03-251-1/+13
|\
| * diff: prevent pprint_rename from underrunning inputThomas Rast2013-02-261-7/+10
| * diff: Fix rename pretty-print when suffix and prefix overlapAntoine Pelisse2013-02-231-1/+10
* | diff.c: diff.renamelimit => diff.renameLimit in messageMax Nanasy2013-03-211-1/+1
* | Merge branch 'mp/diff-algo-config'Junio C Hamano2013-02-171-0/+34
|\ \
| * | diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-161-1/+11
| * | config: Introduce diff.algorithm variableMichal Privoznik2013-01-161-0/+24
* | | Merge branch 'jk/diff-graph-cleanup'Junio C Hamano2013-02-141-97/+34
|\ \ \
| * | | diff.c: use diff_line_prefix() where applicableJohn Keeping2013-02-121-95/+20
| * | | diff: add diff_line_prefix functionJohn Keeping2013-02-121-0/+10
| * | | diff.c: make constant string arguments constJohn Keeping2013-02-121-2/+4
| * | | diff: write prefix to the correct fileJohn Keeping2013-02-121-1/+1
| |/ /
* | | Merge branch 'jc/blame-no-follow'Junio C Hamano2013-01-141-0/+2
|\ \ \ | |/ / |/| |
| * | diff: accept --no-follow optionJunio C Hamano2012-09-211-0/+2
* | | Merge branch 'lt/diff-stat-show-0-lines'Junio C Hamano2012-11-291-25/+29
|\ \ \
| * | | diff --shortstat: do not count "unmerged" entriesJunio C Hamano2012-11-271-3/+2
| * | | diff --stat: do not count "unmerged" entriesJunio C Hamano2012-11-271-2/+4
| * | | diff --stat: move the "total count" logic to the last loopJunio C Hamano2012-11-271-9/+12
| * | | diff --stat: use "file" temporary variable to refer to data->files[i]Junio C Hamano2012-11-271-13/+13
| * | | diff --stat: status of unmodified pair in diff-q is not zeroJunio C Hamano2012-11-271-1/+1
* | | | Merge branch 'rr/submodule-diff-config'Junio C Hamano2012-11-251-11/+35
|\ \ \ \
| * | | | submodule: display summary header in boldRamkumar Ramachandra2012-11-181-1/+1
| * | | | diff: rename "set" variableJeff King2012-11-181-6/+6
| * | | | diff: introduce diff.submodule configuration variableRamkumar Ramachandra2012-11-181-4/+28
* | | | | Merge branch 'lt/diff-stat-show-0-lines'Junio C Hamano2012-11-251-10/+15
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix "git diff --stat" for interesting - but empty - file changesLinus Torvalds2012-10-171-10/+15
* | | | | Merge branch 'nd/builtin-to-libgit'Jeff King2012-11-091-0/+16
|\ \ \ \ \
| * | | | | Move setup_diff_pager to libgit.aNguyễn Thái Ngọc Duy2012-10-291-0/+16
| | |/ / / | |/| | |
* | | | | Merge branch 'mh/maint-parse-dirstat-fix'Jeff King2012-11-091-19/+21
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | parse_dirstat_params(): use string_list to split comma-separated stringMichael Haggerty2012-10-291-19/+21
| * | | | Merge branch 'nd/maint-diffstat-summary' into maintJunio C Hamano2012-09-201-6/+4
| |\ \ \ \
| * \ \ \ \ Sync with 1.7.11.6Junio C Hamano2012-09-111-3/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11Junio C Hamano2012-09-111-0/+1
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-111-3/+1
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-101-6/+10
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-101-6/+10
| | |\ \ \ \ \ \
* | | | | | | | | diff: diff.context configuration gives default to -UJeff Muizelaar2012-09-301-1/+8
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge branch 'jc/make-static'Junio C Hamano2012-09-181-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | diff.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-151-1/+1
* | | | | | | | | Merge branch 'nd/maint-diffstat-summary'Junio C Hamano2012-09-171-6/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Revert diffstat back to EnglishNguyễn Thái Ngọc Duy2012-09-141-6/+4
| |/ / / / / /
* | | | | | | Merge branch 'ab/diff-write-incomplete-line'Junio C Hamano2012-08-271-0/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Fix '\ No newline...' annotation in rewrite diffsAdam Butcher2012-08-051-0/+1
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'jv/maint-no-ext-diff' into maintJunio C Hamano2012-07-301-3/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/refactor-diff-stdin' into maintJunio C Hamano2012-07-221-20/+1
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jk/maint-null-in-trees'Junio C Hamano2012-08-271-6/+10
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | diff: do not use null sha1 as a sentinel valueJeff King2012-07-291-6/+10
* | | | | | | | Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-221-3/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | diff_setup_done(): return voidThomas Rast2012-08-031-3/+1
| |/ / / / /
* | | | | | Merge branch 'nd/maint-i18n-diffstat'Junio C Hamano2012-07-311-1/+1
|\ \ \ \ \ \
View Lorry Controller Status