summaryrefslogtreecommitdiff
path: root/blame.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/tree-walk-with-repo'Junio C Hamano2019-07-191-2/+2
|\
| * tree-walk.c: remove the_repo from get_tree_entry()Nguyễn Thái Ngọc Duy2019-06-271-2/+2
* | Merge branch 'br/blame-ignore'Junio C Hamano2019-07-191-56/+959
|\ \ | |/ |/|
| * blame: drop some unused function parametersJeff King2019-06-281-4/+3
| * blame: use the fingerprint heuristic to match ignored linesBarret Rhoden2019-06-201-5/+55
| * blame: add a fingerprint heuristic to match ignored linesMichael Platings2019-06-201-0/+642
| * blame: optionally track line fingerprints during fill_blame_origin()Barret Rhoden2019-05-161-30/+60
| * blame: add config options for the output of ignored or unblamable linesBarret Rhoden2019-05-161-1/+13
| * blame: add the ability to ignore commits and their changesBarret Rhoden2019-05-161-9/+167
| * blame: use a helper function in blame_chunk()Barret Rhoden2019-05-161-16/+28
* | Merge branch 'en/merge-directory-renames'Junio C Hamano2019-05-091-1/+1
|\ \
| * | Use 'unsigned short' for mode, like diff_filespec doesElijah Newren2019-04-081-1/+1
* | | Merge branch 'dk/blame-keep-origin-blob'Junio C Hamano2019-04-251-1/+2
|\ \ \ | |/ / |/| |
| * | blame.c: don't drop origin blobs as eagerlyDavid Kastrup2019-04-031-1/+2
* | | Merge branch 'wh/author-committer-ident-config'Junio C Hamano2019-03-071-1/+2
|\ \ \ | |/ / |/| |
| * | config: allow giving separate author and committer identsWilliam Hubbs2019-02-041-1/+2
| |/
* | read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy2019-01-141-2/+2
|/
* blame.c: remove implicit dependency the_repositoryNguyễn Thái Ngọc Duy2018-11-121-17/+22
* Merge branch 'nd/the-index'Junio C Hamano2018-10-191-30/+33
|\
| * diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-9/+11
| * diff.c: remove the_index dependency in textconv() functionsNguyễn Thái Ngọc Duy2018-09-211-3/+4
| * blame.c: rename "repo" argument to "r"Nguyễn Thái Ngọc Duy2018-09-211-18/+18
* | convert "oidcmp() != 0" to "!oideq()"Jeff King2018-08-291-2/+2
* | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-2/+2
|/
* Merge branch 'ab/unconditional-free-and-null'Junio C Hamano2018-08-271-3/+1
|\
| * refactor various if (x) FREE_AND_NULL(x) to just FREE_AND_NULL(x)Ævar Arnfjörð Bjarmason2018-08-171-3/+1
* | blame.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-08-131-21/+31
* | Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano2018-08-021-3/+2
|\ \
| * | block alloc: add lifecycle APIs for cache_entry structsJameson Miller2018-07-031-3/+2
| |/
* | tag: add repository argument to deref_tagStefan Beller2018-06-291-3/+3
* | commit: add repository argument to set_commit_bufferStefan Beller2018-06-291-1/+1
* | commit: add repository argument to lookup_commit_referenceStefan Beller2018-06-291-1/+1
* | commit: add repository argument to lookup_commit_reference_gentlyStefan Beller2018-06-291-1/+2
* | Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-291-3/+6
|\ \
| * | path.c: migrate global git_path_* to take a repository argumentStefan Beller2018-05-181-3/+5
| * | object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | | Merge branch 'sb/object-store-alloc'Junio C Hamano2018-06-251-1/+2
|\ \ \ | |/ /
| * | alloc: allow arbitrary repositories for alloc functionsStefan Beller2018-05-161-0/+1
| * | alloc: add repository argument to alloc_commit_nodeStefan Beller2018-05-091-1/+1
* | | Merge branch 'nd/commit-util-to-slab'Junio C Hamano2018-06-251-11/+31
|\ \ \ | |_|/ |/| |
| * | blame: use commit-slab for blame suspects instead of commit->utilNguyễn Thái Ngọc Duy2018-05-211-11/+31
* | | Merge branch 'js/use-bug-macro'Junio C Hamano2018-05-301-1/+1
|\ \ \
| * | | Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-1/+1
| |/ /
* | | Merge branch 'sb/oid-object-info'Junio C Hamano2018-05-231-2/+2
|\ \ \ | | |/ | |/|
| * | cache.h: add repository argument to oid_object_infoStefan Beller2018-04-261-2/+2
| |/
* | Merge branch 'ds/lazy-load-trees'Junio C Hamano2018-05-231-9/+9
|\ \ | |/ |/|
| * treewide: replace maybe_tree with accessor methodsDerrick Stolee2018-04-111-9/+9
| * treewide: rename tree to maybe_treeDerrick Stolee2018-04-111-9/+9
| * Merge branch 'bw/c-plus-plus' into ds/lazy-load-treesJunio C Hamano2018-04-111-16/+17
| |\
* | | sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-4/+4