summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* color: check color.ui in git_default_config()Jeff King2017-07-131-3/+0
* Merge branch 'rs/use-div-round-up'Junio C Hamano2017-07-121-1/+1
|\
| * use DIV_ROUND_UPrs/use-div-round-upRené Scharfe2017-07-101-1/+1
* | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-241-4/+2
|\ \
| * | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-161-4/+2
* | | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ \
| * | | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
| | |/ | |/|
* | | Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano2017-06-241-3/+3
|\ \ \
| * | | convert: convert convert_to_git to take an indexBrandon Williams2017-06-131-3/+3
* | | | Merge branch 'bw/object-id'Junio C Hamano2017-06-191-38/+38
|\ \ \ \ | |_|_|/ |/| | |
| * | | diff: rename diff_fill_sha1_info to diff_fill_oid_infoBrandon Williams2017-06-051-9/+9
| * | | diff: convert diff_flush_patch_id to struct object_idBrandon Williams2017-06-021-6/+6
| * | | diff: finish conversion for prepare_temp_file to struct object_idBrandon Williams2017-06-021-2/+2
| * | | diff: convert reuse_worktree_file to struct object_idBrandon Williams2017-06-021-5/+5
| * | | diff: convert fill_filespec to struct object_idBrandon Williams2017-06-021-8/+8
| * | | diff: convert diff_change to struct object_idBrandon Williams2017-06-021-7/+7
| * | | diff: convert diff_addremove to struct object_idBrandon Williams2017-06-021-4/+4
* | | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-131-6/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | use xfopen() in more placesNguyễn Thái Ngọc Duy2017-05-261-6/+2
* | | | Merge branch 'js/blame-lib'Junio C Hamano2017-06-051-0/+23
|\ \ \ \
| * | | | blame: move textconv_object with related functionsJeff Smith2017-05-241-0/+23
| | |_|/ | |/| |
* | | | Merge branch 'mb/diff-default-to-indent-heuristics'Junio C Hamano2017-06-051-4/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | diff: enable indent heuristic by defaultStefan Beller2017-05-091-1/+1
| * | | diff: make the indent heuristic part of diff's basic configurationMarc Branchaud2017-05-091-3/+3
| | |/ | |/|
* | | Merge branch 'bc/object-id'Junio C Hamano2017-05-291-2/+2
|\ \ \ | |_|/ |/| |
| * | notes-cache: convert to struct object_idbrian m. carlson2017-05-081-2/+2
| |/
* | fix minor typosrg/a-the-typoRené Genz2017-05-011-1/+1
|/
* Merge branch 'bc/object-id'Junio C Hamano2017-04-191-2/+2
|\
| * Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZbrian m. carlson2017-03-261-2/+2
* | diff: avoid fixed-size buffer for patch-idsJeff King2017-03-301-31/+37
* | prefix_filename: return newly allocated stringJeff King2017-03-211-3/+3
* | prefix_filename: drop length parameterJeff King2017-03-211-2/+2
|/
* Merge branch 'jc/diff-populate-filespec-size-only-fix'Junio C Hamano2017-03-121-1/+18
|\
| * diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()jc/diff-populate-filespec-size-only-fixJunio C Hamano2017-03-021-1/+18
* | Merge branch 'rs/swap'Junio C Hamano2017-02-151-8/+4
|\ \
| * | diff: use SWAP macroRené Scharfe2017-01-301-3/+1
| * | use SWAP macroRené Scharfe2017-01-301-5/+3
* | | Merge branch 'jk/log-graph-name-only'Junio C Hamano2017-02-101-0/+1
|\ \ \
| * | | diff: print line prefix for --name-only outputjk/log-graph-name-onlyJeff King2017-02-081-0/+1
| * | | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maintJunio C Hamano2016-08-101-0/+7
| |\ \ \
* | | | | use oid_to_hex_r() for converting struct object_id hashes to hex stringsRené Scharfe2017-01-301-1/+1
| |_|/ / |/| | |
* | | | diff: add interhunk context config optionvn/diff-ihc-configVegard Nossum2017-01-121-0/+8
* | | | Merge branch 'jc/retire-compaction-heuristics'Junio C Hamano2017-01-101-20/+3
|\ \ \ \
| * | | | diff: retire "compaction" heuristicsjc/retire-compaction-heuristicsJunio C Hamano2016-12-231-20/+3
* | | | | diff: handle --no-abbrev in no-index casejb/diff-no-index-no-abbrevJack Bates2016-12-081-1/+5
* | | | | Merge branch 'tk/diffcore-delta-remove-unused'Junio C Hamano2016-11-171-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | diffcore-delta: remove unused parameter to diffcore_count_changes()tk/diffcore-delta-remove-unusedTobias Klauser2016-11-141-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'nd/ita-empty-commit'Junio C Hamano2016-10-271-0/+4
|\ \ \ \
| * | | | diff: add --ita-[in]visible-in-indexNguyễn Thái Ngọc Duy2016-10-241-0/+4
* | | | | Merge branch 'jk/no-looking-at-dotgit-outside-repo'Junio C Hamano2016-10-271-16/+29
|\ \ \ \ \
View Lorry Controller Status