summaryrefslogtreecommitdiff
path: root/builtin/blame.c
Commit message (Expand)AuthorAgeFilesLines
* blame: correctly handle files regardless of autocrlfbc/blame-crlf-testbrian m. carlson2014-05-081-1/+0
* 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
|\ \ \ \ \
| * | | | | blame: allow "blame file" in the middle of a conflicted mergeJunio C Hamano2012-09-111-24/+69
| * | | | | blame $path: avoid getting fooled by case insensitive filesystemsJunio C Hamano2012-09-101-2/+14
| * | | | | Merge branch 'jc/maint-blame-minimal' into maintJunio C Hamano2012-05-011-0/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'nd/i18n-parseopt-help'Junio C Hamano2012-09-071-23/+23
|\ \ \ \ \ \ \
| * | | | | | | i18n: blame: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-23/+23
* | | | | | | | Merge branch 'jk/maint-null-in-trees'Junio C Hamano2012-08-271-4/+5
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | diff: do not use null sha1 as a sentinel valueJeff King2012-07-291-4/+5
* | | | | | | | Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-221-6/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | diff_setup_done(): return voidThomas Rast2012-08-031-6/+3
| |/ / / / /
* | | | | | Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer2012-07-111-1/+2
* | | | | | Merge branch 'jc/maint-blame-unique-abbrev'Junio C Hamano2012-07-091-4/+21
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | blame: compute abbreviation width that ensures uniquenessJunio C Hamano2012-07-021-4/+21
* | | | | builtin/blame.c: Fix a "Using plain integer as NULL pointer" warningRamsay Jones2012-05-141-1/+1
* | | | | blame: factor out helper for calling xdi_diff()René Scharfe2012-05-091-22/+16
* | | | | blame: use hunk_func(), part 2René Scharfe2012-05-091-5/+13