summaryrefslogtreecommitdiff
path: root/line-log.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'vn/line-log-memcpy-size-fix' into maintJunio C Hamano2017-03-161-1/+2
|\
| * line-log: use COPY_ARRAY to fix mis-sized memcpyvn/line-log-memcpy-size-fixVegard Nossum2017-03-061-1/+2
* | Merge branch 'ax/line-log-range-merge-fix' into maintJunio C Hamano2017-03-161-8/+7
|\ \
| * | line-log.c: prevent crash during union of too many rangesax/line-log-range-merge-fixAllan Xavier2017-03-031-8/+7
| |/
* | use QSORTRené Scharfe2016-09-291-1/+1
|/
* Merge branch 'bc/cocci'Junio C Hamano2016-07-191-6/+6
|\
| * diff: rename struct diff_filespec's sha1_valid memberbrian m. carlson2016-06-281-5/+5
| * diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-281-1/+1
* | Merge branch 'js/log-to-diffopt-file'Junio C Hamano2016-07-191-17/+17
|\ \
| * | line-log: respect diffopt's configured output file streamJohannes Schindelin2016-06-241-17/+17
| |/
* | Merge branch 'jc/deref-tag'Junio C Hamano2016-06-271-2/+1
|\ \ | |/ |/|
| * blame, line-log: do not loop around deref_tag()jc/deref-tagJunio C Hamano2016-06-141-2/+1
* | convert trivial cases to ALLOC_ARRAYJeff King2016-02-221-4/+4
* | convert manual allocations to argv_arrayJeff King2016-02-221-13/+9
* | Remove get_object_hash.brian m. carlson2015-11-201-3/+3
* | Add several uses of get_object_hash.brian m. carlson2015-11-201-3/+3
|/
* Sync with 2.3.10Junio C Hamano2015-09-281-3/+4
|\
| * react to errors in xdi_diffJeff King2015-09-281-3/+4
* | Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano2015-06-251-3/+3
|\ \
| * | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTjk/color-diff-plain-is-contextJeff King2015-05-271-3/+3
* | | Merge branch 'sb/line-log-plug-pairdiff-leak' into maintJunio C Hamano2015-05-131-0/+1
|\ \ \
| * | | line-log.c: fix a memleaksb/line-log-plug-pairdiff-leakStefan Beller2015-03-301-0/+1
| |/ /
* | | Sync with 2.3.8Junio C Hamano2015-05-111-1/+1
|\ \ \ | | |/ | |/|
| * | log -L: improve error message on malformed argumentmm/usage-log-l-can-take-regexMatthieu Moy2015-04-201-1/+1
| |/
* | line-log.c: make line_log_data_init() staticJunio C Hamano2015-01-151-1/+1
|/
* Merge branch 'tm/line-log-first-parent'Junio C Hamano2014-11-061-0/+3
|\
| * line-log: fix crash when --first-parent is usedtm/line-log-first-parentTzvetan Mikov2014-11-041-0/+3
* | use REALLOC_ARRAY for changing the allocation size of arraysrs/realloc-arrayRené Scharfe2014-09-181-1/+1
* | use commit_list_count() to count the members of commit_listsRené Scharfe2014-07-171-12/+1
* | line-log: use commit_list_append() instead of duplicating its codeRené Scharfe2014-07-081-3/+1
* | line-log: convert to using diff_tree_sha1()Kirill Smelkov2014-02-051-24/+2
* | Merge branch 'nd/magic-pathspec'Junio C Hamano2013-10-301-1/+2
|\ \
| * | Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flagsNguyễn Thái Ngọc Duy2013-10-221-1/+2
* | | Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-091-1/+1
|\ \ \ | |/ /
| * | line-log: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-151-1/+1
* | | log: teach -L/RE/ to search from end of previous -L rangeEric Sunshine2013-08-061-3/+12
* | | line-range: teach -L/RE/ to search relative to anchor pointEric Sunshine2013-08-061-1/+1
* | | range-set: publish API for re-use by git-blame -LEric Sunshine2013-08-061-5/+5
* | | log: fix -L bounds checking bugEric Sunshine2013-08-051-2/+2
| |/ |/|
* | line-log: fix "log -LN" crash when N is last line of filees/line-log-further-fixesEric Sunshine2013-07-231-0/+1
* | range-set: satisfy non-empty ranges invariantEric Sunshine2013-07-231-0/+2
* | range-set: fix sort_and_merge_range_set() corner case bugEric Sunshine2013-07-231-3/+3
* | range_set: fix coalescing bug when range is a subset of anotheres/overlapping-range-setEric Sunshine2013-07-091-1/+2
|/
* log -L: improve comments in process_all_files()Thomas Rast2013-04-121-3/+16
* log -L: store the path instead of a diff_filespecThomas Rast2013-04-121-21/+24
* log -L: fix overlapping input rangesThomas Rast2013-04-051-7/+10
* log -L: check range set invariants when we look it upThomas Rast2013-04-051-0/+26
* Speed up log -L... -MThomas Rast2013-03-281-4/+52
* log -L: :pattern:file syntax to find by funcnameThomas Rast2013-03-281-2/+3
* Implement line-history search (git log -L)Thomas Rast2013-03-281-0/+1179