summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mt/use-passed-repo-more-in-funcs'Junio C Hamano2020-02-141-1/+1
|\
| * diff: make diff_populate_filespec() honor its repo argumentMatheus Tavares2020-01-311-1/+1
* | diff: move diff.wsErrorHighlight to "basic" configJeff King2020-01-311-8/+8
|/
* Merge branch 'js/builtin-add-i'Junio C Hamano2019-12-051-23/+16
|\
| * diff: export diffstat interfaceDaniel Ferreira2019-11-141-23/+16
* | Fix spelling errors in code commentsElijah Newren2019-11-101-2/+2
|/
* Merge branch 'ew/hashmap'Junio C Hamano2019-10-151-13/+18
|\
| * hashmap: remove type arg from hashmap_{get,put,remove}_entryEric Wong2019-10-071-4/+2
| * OFFSETOF_VAR macro to simplify hashmap iteratorsEric Wong2019-10-071-3/+2
| * hashmap: introduce hashmap_free_entriesEric Wong2019-10-071-2/+4
| * hashmap_cmp_fn takes hashmap_entry paramsEric Wong2019-10-071-5/+7
| * hashmap: use *_entry APIs to wrap container_ofEric Wong2019-10-071-12/+9
| * hashmap_get_next returns "struct hashmap_entry *"Eric Wong2019-10-071-7/+12
| * hashmap_get takes "const struct hashmap_entry *"Eric Wong2019-10-071-2/+2
| * hashmap_add takes "struct hashmap_entry *"Eric Wong2019-10-071-1/+1
| * hashmap_get_next takes "const struct hashmap_entry *"Eric Wong2019-10-071-2/+3
| * diff: use hashmap_entry_init on moved_entry.entEric Wong2019-10-071-1/+2
* | Merge branch 'bc/object-id-part17'Junio C Hamano2019-10-111-23/+23
|\ \
| * | patch-id: convert to use the_hash_algobrian m. carlson2019-08-191-23/+23
| |/
* | Merge branch 'cc/multi-promisor'Junio C Hamano2019-09-181-5/+4
|\ \
| * | Use promisor_remote_get_direct() and has_promisor_remote()Christian Couder2019-06-251-5/+4
* | | Merge branch 'jt/diff-lazy-fetch-submodule-fix'Junio C Hamano2019-09-091-0/+1
|\ \ \ | |_|/ |/| |
| * | diff: skip GITLINK when lazy fetching missing objsJonathan Tan2019-08-201-0/+1
| * | Merge branch 'js/unmap-before-ext-diff' into maintJunio C Hamano2019-07-291-0/+2
| |\ \
* | \ \ 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
View Lorry Controller Status