summaryrefslogtreecommitdiff
path: root/builtin/blame.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | blame: use hunk_func(), part 1René Scharfe2012-05-091-5/+12
* | | | | Merge branch 'jc/maint-blame-minimal'Junio C Hamano2012-04-231-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | blame: accept --need-minimalJunio C Hamano2012-04-111-0/+1
| | |/ | |/|
* | | Merge branch 'zj/decimal-width'Junio C Hamano2012-02-201-15/+3
|\ \ \
| * | | make lineno_width() from blame reusable for otherszj/decimal-widthZbigniew Jędrzejewski-Szmek2012-02-141-15/+3
| |/ /
* | | drop odd return value semantics from userdiff_configjk/userdiff-config-simplifyJeff King2012-02-071-7/+1
|/ /
* | Merge branch 'maint-1.7.7' into maintJunio C Hamano2011-12-131-1/+1
|\ \ | |/
| * blame: don't overflow time bufferJeff King2011-12-131-1/+1
* | Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano2011-11-071-4/+3
|\ \
| * | blame.c: Properly initialize strbuf after calling textconv_object(), againSebastian Schuberth2011-11-071-4/+3
* | | Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano2011-11-011-1/+3
|\ \ \ | |/ / | | / | |/ |/|
| * blame.c: Properly initialize strbuf after calling, textconv_object()Sebastian Schuberth2011-10-281-1/+3
* | blame: add --line-porcelain output formatJeff King2011-05-091-2/+8
* | blame: refactor porcelain outputJeff King2011-05-091-9/+16
* | Merge branch 'js/blame-parsename'Junio C Hamano2011-05-061-1/+1
|\ \
| * | blame: tolerate bogus e-mail addresses a bit betterJosh Stone2011-04-291-1/+1
* | | blame: add --abbrev command line option and make it honor core.abbrevNamhyung Kim2011-04-051-1/+8
|/ /
* | standardize brace placement in struct definitionsJonathan Nieder2011-03-161-2/+1
* | Merge branch 'jn/parse-options-extra'Junio C Hamano2010-12-121-2/+2
|\ \
| * | parse-options: Don't call parse_options_check() so muchStephen Boyd2010-12-061-2/+2