summaryrefslogtreecommitdiff
path: root/builtin/blame.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/blame-crlf-test'Junio C Hamano2014-06-061-1/+0
|\
| * blame: correctly handle files regardless of autocrlfbc/blame-crlf-testbrian m. carlson2014-05-081-1/+0
* | Merge branch 'dk/blame-reorg'Junio C Hamano2014-06-061-298/+567
|\ \
| * | blame: large-scale performance rewritedk/blame-reorgDavid Kastrup2014-04-281-298/+567
* | | blame: dynamic blame_date_width for different localesjx/blame-align-relative-timeJiang Xin2014-04-231-1/+8
* | | blame: fix broken time_buf paddings in relative timestampJiang Xin2014-04-231-7/+14
|/ /
* | Merge branch 'nd/log-show-linear-break'Junio C Hamano2014-04-031-1/+1
|\ \
| * | object.h: centralize object flag allocationNguyễn Thái Ngọc Duy2014-03-251-1/+1
| |/
* | Merge branch 'dk/blame-janitorial'Junio C Hamano2014-02-271-51/+42
|\ \
| * | builtin/blame.c::find_copy_in_blob: no need to scan for region enddk/blame-janitorialDavid Kastrup2014-02-251-8/+1
| * | blame.c: prepare_lines should not call xrealloc for every lineDavid Kastrup2014-02-241-15/+31
| * | builtin/blame.c::prepare_lines: fix allocation size of sb->linenoDavid Kastrup2014-02-241-2/+2
| * | builtin/blame.c: eliminate same_suspect()David Kastrup2014-02-241-17/+8
| * | builtin/blame.c: struct blame_entry does not need a prev linkDavid Kastrup2014-01-221-11/+2
| |/
* | Merge branch 'ep/varscope'Junio C Hamano2014-02-271-3/+3
|\ \ | |/ |/|
| * builtin/blame.c: reduce scope of variablesElia Pinto2014-01-311-3/+3
* | Merge branch 'js/lift-parent-count-limit'Junio C Hamano2014-01-101-4/+4
|\ \
| * | Remove the line length limit for graft filesjs/lift-parent-count-limitJohannes Schindelin2013-12-271-4/+4
| |/
* | Merge branch 'jk/robustify-parse-commit'Junio C Hamano2013-12-051-2/+1
|\ \ | |/ |/|
| * assume parse_commit checks commit->object.parsedJeff King2013-10-241-2/+1
* | pathspec: stop --*-pathspecs impact on internal parse_pathspec() usesnd/literal-pathspecsnd/liteal-pathspecsNguyễn Thái Ngọc Duy2013-10-281-1/+3
* | Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-091-10/+4
|\ \
| * | remove init_pathspec() in favor of parse_pathspec()Nguyễn Thái Ngọc Duy2013-07-151-7/+1
| * | remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy2013-07-151-6/+6
| |/
* | Merge branch 'es/blame-L-twice'Junio C Hamano2013-09-091-43/+50
|\ \
| * | blame: teach -L/RE/ to search from end of previous -L rangeEric Sunshine2013-08-061-1/+4
| * | line-range: teach -L/RE/ to search relative to anchor pointEric Sunshine2013-08-061-1/+1
| * | blame: accept multiple -L rangesEric Sunshine2013-08-061-32/+47
| * | blame: inline one-line function into its lone callerEric Sunshine2013-08-061-14/+3
* | | Merge branch 'es/blame-L-more'Junio C Hamano2013-09-091-2/+2
|\ \ \ | |/ /
| * | blame: fix -L bounds checking bugEric Sunshine2013-08-051-2/+2
| |/
* | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-051-4/+4
|/
* Merge branch 'tr/line-log'Junio C Hamano2013-06-021-91/+8
|\
| * log -L: :pattern:file syntax to find by funcnameThomas Rast2013-03-281-1/+1
| * Refactor parse_locBo Yang2013-03-281-91/+8
* | Merge branch 'nd/pretty-formats'Junio C Hamano2013-04-231-1/+1
|\ \
| * | pretty: save commit encoding from logmsg_reencode if the caller needs itNguyễn Thái Ngọc Duy2013-04-181-1/+1
| |/
* | blame: handle broken commit headers gracefullyRené Scharfe2013-04-171-3/+8
|/
* logmsg_reencode: lazily load missing commit buffersJeff King2013-01-261-13/+0
* logmsg_reencode: never return NULLJeff King2013-01-261-5/+4
* Merge branch 'ap/log-mailmap'Junio C Hamano2013-01-201-97/+86
|\
| * mailmap: simplify map_user() interfaceAntoine Pelisse2013-01-101-75/+81
| * Use split_ident_line to parse author and committerAntoine Pelisse2013-01-071-38/+21
* | Merge branch 'jc/blame-no-follow'Junio C Hamano2013-01-141-1/+5
|\ \ | |/ |/|
| * blame: pay attention to --no-followJunio C Hamano2012-09-211-1/+5
| * Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-111-6/+3
| |\
| * \ Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-101-4/+5
| |\ \
| * \ \ Merge branch 'jc/maint-blame-unique-abbrev' into maintJunio C Hamano2012-07-111-4/+21
| |\ \ \
* | | | | pretty: remove reencode_commit_message()Junio C Hamano2012-10-171-2/+3
* | | | | Merge branch 'jc/maint-blame-no-such-path'Junio C Hamano2012-09-171-16/+73
|\ \ \ \ \