aboutsummaryrefslogtreecommitdiff
path: root/builtin/blame.c
Commit message (Expand)AuthorAge
* Merge branch 'bc/blame-crlf-test' into maintJunio C Hamano2014-06-25
|\
| * blame: correctly handle files regardless of autocrlfbrian m. carlson2014-05-08
* | blame: dynamic blame_date_width for different localesJiang Xin2014-04-23
* | blame: fix broken time_buf paddings in relative timestampJiang Xin2014-04-23
* | Merge branch 'nd/log-show-linear-break'Junio C Hamano2014-04-03
|\ \
| * | object.h: centralize object flag allocationNguyễn Thái Ngọc Duy2014-03-25
| |/
* | Merge branch 'dk/blame-janitorial'Junio C Hamano2014-02-27
|\ \
| * | builtin/blame.c::find_copy_in_blob: no need to scan for region endDavid Kastrup2014-02-25
| * | blame.c: prepare_lines should not call xrealloc for every lineDavid Kastrup2014-02-24
| * | builtin/blame.c::prepare_lines: fix allocation size of sb->linenoDavid Kastrup2014-02-24
| * | builtin/blame.c: eliminate same_suspect()David Kastrup2014-02-24
| * | builtin/blame.c: struct blame_entry does not need a prev linkDavid Kastrup2014-01-22
| |/
* | Merge branch 'ep/varscope'Junio C Hamano2014-02-27
|\ \ | |/ |/|
| * builtin/blame.c: reduce scope of variablesElia Pinto2014-01-31
* | Merge branch 'js/lift-parent-count-limit'Junio C Hamano2014-01-10
|\ \
| * | Remove the line length limit for graft filesJohannes Schindelin2013-12-27
| |/
* | Merge branch 'jk/robustify-parse-commit'Junio C Hamano2013-12-05
|\ \ | |/ |/|
| * assume parse_commit checks commit->object.parsedJeff King2013-10-24
* | pathspec: stop --*-pathspecs impact on internal parse_pathspec() usesNguyễn Thái Ngọc Duy2013-10-28
* | Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-09
|\ \
| * | remove init_pathspec() in favor of parse_pathspec()Nguyễn Thái Ngọc Duy2013-07-15
| * | remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy2013-07-15
| |/
* | Merge branch 'es/blame-L-twice'Junio C Hamano2013-09-09
|\ \
| * | blame: teach -L/RE/ to search from end of previous -L rangeEric Sunshine2013-08-06
| * | line-range: teach -L/RE/ to search relative to anchor pointEric Sunshine2013-08-06
| * | blame: accept multiple -L rangesEric Sunshine2013-08-06
| * | blame: inline one-line function into its lone callerEric Sunshine2013-08-06
* | | Merge branch 'es/blame-L-more'Junio C Hamano2013-09-09
|\ \ \ | |/ /
| * | blame: fix -L bounds checking bugEric Sunshine2013-08-05
| |/
* | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-05
|/
* Merge branch 'tr/line-log'Junio C Hamano2013-06-02
|\
| * log -L: :pattern:file syntax to find by funcnameThomas Rast2013-03-28
| * Refactor parse_locBo Yang2013-03-28
* | Merge branch 'nd/pretty-formats'Junio C Hamano2013-04-23
|\ \
| * | pretty: save commit encoding from logmsg_reencode if the caller needs itNguyễn Thái Ngọc Duy2013-04-18
| |/
* | blame: handle broken commit headers gracefullyRené Scharfe2013-04-17
|/
* logmsg_reencode: lazily load missing commit buffersJeff King2013-01-26
* logmsg_reencode: never return NULLJeff King2013-01-26
* Merge branch 'ap/log-mailmap'Junio C Hamano2013-01-20
|\
| * mailmap: simplify map_user() interfaceAntoine Pelisse2013-01-10
| * Use split_ident_line to parse author and committerAntoine Pelisse2013-01-07
* | Merge branch 'jc/blame-no-follow'Junio C Hamano2013-01-14
|\ \ | |/ |/|
| * blame: pay attention to --no-followJunio C Hamano2012-09-21
| * Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-11
| |\
| * \ Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-10
| |\ \
| * \ \ Merge branch 'jc/maint-blame-unique-abbrev' into maintJunio C Hamano2012-07-11
| |\ \ \
* | | | | pretty: remove reencode_commit_message()Junio C Hamano2012-10-17
* | | | | Merge branch 'jc/maint-blame-no-such-path'Junio C Hamano2012-09-17
|\ \ \ \ \
| * | | | | blame: allow "blame file" in the middle of a conflicted mergeJunio C Hamano2012-09-11
| * | | | | blame $path: avoid getting fooled by case insensitive filesystemsJunio C Hamano2012-09-10