summaryrefslogtreecommitdiffstats
path: root/diff.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/diff-parseopt-2'Junio C Hamano2019-03-071-211/+299
|\
| * diff-parseopt: convert --ignore-some-changesNguyễn Thái Ngọc Duy2019-02-221-11/+16
| * diff-parseopt: convert --[no-]minimalNguyễn Thái Ngọc Duy2019-02-221-5/+6
| * diff-parseopt: convert --relativeNguyễn Thái Ngọc Duy2019-02-221-8/+17
| * diff-parseopt: convert --no-renames|--[no--rename-emptyNguyễn Thái Ngọc Duy2019-02-221-7/+6
| * diff-parseopt: convert --find-copies-harderNguyễn Thái Ngọc Duy2019-02-221-2/+2
| * diff-parseopt: convert -C|--find-copiesNguyễn Thái Ngọc Duy2019-02-221-34/+25
| * diff-parseopt: convert -D|--irreversible-deleteNguyễn Thái Ngọc Duy2019-02-221-4/+4
| * diff-parseopt: convert -M|--find-renamesNguyễn Thái Ngọc Duy2019-02-221-12/+23
| * diff-parseopt: convert -B|--break-rewritesNguyễn Thái Ngọc Duy2019-02-221-26/+36
| * diff-parseopt: convert --output-*Nguyễn Thái Ngọc Duy2019-02-221-18/+53
| * diff-parseopt: convert --[no-]compact-summaryNguyễn Thái Ngọc Duy2019-02-221-6/+19
| * diff-parseopt: convert --stat*Nguyễn Thái Ngọc Duy2019-02-221-66/+52
| * diff-parseopt: convert -s|--no-patchNguyễn Thái Ngọc Duy2019-02-221-3/+4
| * diff-parseopt: convert --name-statusNguyễn Thái Ngọc Duy2019-02-221-3/+4
| * diff-parseopt: convert --name-onlyNguyễn Thái Ngọc Duy2019-02-221-3/+4
| * diff-parseopt: convert --patch-with-statNguyễn Thái Ngọc Duy2019-02-221-4/+5
| * diff-parseopt: convert --summaryNguyễn Thái Ngọc Duy2019-02-221-3/+4
| * diff-parseopt: convert --checkNguyễn Thái Ngọc Duy2019-02-221-3/+4
| * diff-parseopt: convert --dirstat and friendsNguyễn Thái Ngọc Duy2019-02-221-10/+29
| * diff-parseopt: convert --numstat and --shortstatNguyễn Thái Ngọc Duy2019-02-201-5/+7
| * diff-parseopt: convert --patch-with-rawNguyễn Thái Ngọc Duy2019-02-201-4/+5
* | Merge branch 'nd/completion-more-parameters'Junio C Hamano2019-03-071-0/+8
|\ \
| * | completion: add more parameter value completionNguyễn Thái Ngọc Duy2019-02-201-0/+8
* | | Merge branch 'jk/unused-params'Junio C Hamano2019-03-071-19/+12
|\ \ \
| * | | diff: drop complete_rewrite parameter from run_external_diff()Jeff King2019-02-151-3/+1
| * | | diff: drop unused emit data parameter from sane_truncate_line()Jeff King2019-02-151-2/+2
| * | | diff: drop unused color reset parametersJeff King2019-02-151-13/+8
| * | | diff: drop options parameter from diffcore_fix_diff_index()Jeff King2019-02-151-1/+1
| |/ /
* | | Merge branch 'nd/diff-parseopt'Junio C Hamano2019-03-071-12/+59
|\ \ \ | |/ / |/| / | |/
| * diff.c: convert --rawNguyễn Thái Ngọc Duy2019-01-281-3/+4
| * diff.c: convert -W|--[no-]function-contextNguyễn Thái Ngọc Duy2019-01-281-6/+2
| * diff.c: convert -U|--unifiedNguyễn Thái Ngọc Duy2019-01-281-3/+20
| * diff.c: convert -u|-p|--patchNguyễn Thái Ngọc Duy2019-01-281-2/+8
| * diff.c: prepare to use parse_options() for parsingNguyễn Thái Ngọc Duy2019-01-281-0/+27
* | Merge branch 'jk/diff-cc-stat-fixes'Junio C Hamano2019-02-051-1/+3
|\ \
| * | diff: clear emitted_symbols flag after useJeff King2019-01-241-1/+3
* | | Merge branch 'jk/save-getenv-result'Junio C Hamano2019-01-291-1/+4
|\ \ \
| * | | builtin_diff(): read $GIT_DIFF_OPTS closer to useJeff King2019-01-121-1/+4
| * | | Merge branch 'js/diff-notice-has-drive-prefix' into maintJunio C Hamano2018-11-211-2/+2
| |\ \ \
* | \ \ \ Merge branch 'pw/diff-color-moved-ws-fix'Junio C Hamano2019-01-291-78/+143
|\ \ \ \ \
| * | | | | diff --color-moved-ws: handle blank linesPhillip Wood2019-01-101-3/+31
| * | | | | diff --color-moved-ws: modify allow-indentation-changePhillip Wood2019-01-101-58/+74
| * | | | | diff --color-moved-ws: optimize allow-indentation-changePhillip Wood2019-01-101-8/+11
| * | | | | diff --color-moved=zebra: be stricter with color alternationPhillip Wood2019-01-101-8/+19
| * | | | | diff --color-moved-ws: fix false positivesPhillip Wood2019-01-101-6/+9
| * | | | | diff: allow --no-color-moved-wsPhillip Wood2019-01-101-1/+5
| * | | | | Use "whitespace" consistentlyPhillip Wood2019-01-101-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'kg/external-diff-save-env'Junio C Hamano2019-01-291-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | diff: ensure correct lifetime of external_diff_cmdKim Gybels2019-01-121-1/+1
| |/ / /