summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/unmap-before-ext-diff'Junio C Hamano2019-07-251-0/+2
|\
| * diff: munmap() file contents before running external diffJohannes Schindelin2019-07-111-0/+2
* | range-diff: suppress line count in outer diffThomas Gummerer2019-07-111-1/+4
* | Merge branch 'sb/format-patch-base-patch-id-fix'Junio C Hamano2019-06-131-5/+27
|\ \
| * | format-patch: make --base patch-id output stableStephen Boyd2019-05-081-5/+27
* | | i18n: fix typos found during l10n for git 2.22.0Jiang Xin2019-06-031-1/+1
* | | Merge branch 'ja/diff-opt-typofix'Junio C Hamano2019-05-301-2/+2
|\ \ \
| * | | diff: fix mistake in translatable stringsJean-Noël Avila2019-05-191-2/+2
| |/ /
* | | Merge branch 'nd/diff-parseopt'Junio C Hamano2019-05-301-4/+6
|\ \ \ | |/ / |/| |
| * | diff-parseopt: restore -U (no argument) behaviorNguyễn Thái Ngọc Duy2019-05-291-4/+6
* | | Merge branch 'jt/batch-fetch-blobs-in-diff'Junio C Hamano2019-04-251-0/+34
|\ \ \
| * | | diff: batch fetching of missing blobsJonathan Tan2019-04-081-0/+34
* | | | Merge branch 'nd/diff-parseopt-4'Junio C Hamano2019-04-251-171/+168
|\ \ \ \
| * | | | am: avoid diff_opt_parse()Nguyễn Thái Ngọc Duy2019-03-241-0/+6
| * | | | diff.c: allow --no-color-moved-wsNguyễn Thái Ngọc Duy2019-03-241-2/+6
| * | | | diff-parseopt: convert --color-moved-wsNguyễn Thái Ngọc Duy2019-03-241-17/+18
| * | | | diff-parseopt: convert --[no-]color-movedNguyễn Thái Ngọc Duy2019-03-241-13/+25
| * | | | diff-parseopt: convert --inter-hunk-contextNguyễn Thái Ngọc Duy2019-03-241-47/+3
| * | | | diff-parseopt: convert --no-prefixNguyễn Thái Ngọc Duy2019-03-241-2/+15
| * | | | diff-parseopt: convert --line-prefixNguyễn Thái Ngọc Duy2019-03-241-8/+15
| * | | | diff-parseopt: convert --[src|dst]-prefixNguyễn Thái Ngọc Duy2019-03-241-8/+6
| * | | | diff-parseopt: convert --[no-]abbrevNguyễn Thái Ngọc Duy2019-03-241-11/+1
| * | | | diff-parseopt: convert --diff-filterNguyễn Thái Ngọc Duy2019-03-241-9/+9
| * | | | diff-parseopt: convert --find-objectNguyễn Thái Ngọc Duy2019-03-241-5/+9
| * | | | diff-parseopt: convert -ONguyễn Thái Ngọc Duy2019-03-241-20/+3
| * | | | diff-parseopt: convert --pickaxe-all|--pickaxe-regexNguyễn Thái Ngọc Duy2019-03-241-4/+6
| * | | | diff-parseopt: convert -S|-GNguyễn Thái Ngọc Duy2019-03-241-9/+28
| * | | | diff-parseopt: convert -lNguyễn Thái Ngọc Duy2019-03-241-4/+2
| * | | | diff-parseopt: convert -zNguyễn Thái Ngọc Duy2019-03-241-2/+3
| * | | | diff-parseopt: convert --ita-[in]visible-in-indexNguyễn Thái Ngọc Duy2019-03-241-4/+7
| * | | | diff-parseopt: convert --ws-error-highlightNguyễn Thái Ngọc Duy2019-03-241-10/+12
* | | | | Merge branch 'nd/diff-parseopt-3'Junio C Hamano2019-04-161-114/+228
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | diff-parseopt: convert --submoduleNguyễn Thái Ngọc Duy2019-03-071-11/+19
| * | | diff-parseopt: convert --ignore-submodulesNguyễn Thái Ngọc Duy2019-03-071-3/+17
| * | | diff-parseopt: convert --textconvNguyễn Thái Ngọc Duy2019-03-071-6/+19
| * | | diff-parseopt: convert --ext-diffNguyễn Thái Ngọc Duy2019-03-071-5/+3
| * | | diff-parseopt: convert --quietNguyễn Thái Ngọc Duy2019-03-071-3/+3
| * | | diff-parseopt: convert --exit-codeNguyễn Thái Ngọc Duy2019-03-071-3/+3
| * | | diff-parseopt: convert --color-wordsNguyễn Thái Ngọc Duy2019-03-071-5/+16
| * | | diff-parseopt: convert --word-diff-regexNguyễn Thái Ngọc Duy2019-03-071-6/+15
| * | | diff-parseopt: convert --word-diffNguyễn Thái Ngọc Duy2019-03-071-18/+29
| * | | diff-parseopt: convert --[no-]colorNguyễn Thái Ngọc Duy2019-03-071-9/+3
| * | | diff-parseopt: convert --[no-]followNguyễn Thái Ngọc Duy2019-03-071-6/+19
| * | | diff-parseopt: convert -RNguyễn Thái Ngọc Duy2019-03-071-3/+3
| * | | diff-parseopt: convert -a|--textNguyễn Thái Ngọc Duy2019-03-071-3/+3
| * | | diff-parseopt: convert --full-indexNguyễn Thái Ngọc Duy2019-03-071-3/+3
| * | | diff-parseopt: convert --binaryNguyễn Thái Ngọc Duy2019-03-071-5/+16
| * | | diff-parseopt: convert --anchoredNguyễn Thái Ngọc Duy2019-03-071-9/+17
| * | | diff-parseopt: convert --diff-algorithmNguyễn Thái Ngọc Duy2019-03-071-11/+22
| * | | diff-parseopt: convert --histogramNguyễn Thái Ngọc Duy2019-03-071-3/+4