aboutsummaryrefslogtreecommitdiff
path: root/builtin/blame.c
Commit message (Expand)AuthorAge
* 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
| * | | | | Merge branch 'jc/maint-blame-minimal' into maintJunio C Hamano2012-05-01
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'nd/i18n-parseopt-help'Junio C Hamano2012-09-07
|\ \ \ \ \ \ \
| * | | | | | | i18n: blame: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-20
* | | | | | | | Merge branch 'jk/maint-null-in-trees'Junio C Hamano2012-08-27
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | diff: do not use null sha1 as a sentinel valueJeff King2012-07-29
* | | | | | | | Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-22
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | diff_setup_done(): return voidThomas Rast2012-08-03
| |/ / / / /
* | | | | | Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer2012-07-11
* | | | | | Merge branch 'jc/maint-blame-unique-abbrev'Junio C Hamano2012-07-09
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | blame: compute abbreviation width that ensures uniquenessJunio C Hamano2012-07-02
* | | | | builtin/blame.c: Fix a "Using plain integer as NULL pointer" warningRamsay Jones2012-05-14
* | | | | blame: factor out helper for calling xdi_diff()René Scharfe2012-05-09
* | | | | blame: use hunk_func(), part 2René Scharfe2012-05-09
* | | | | blame: use hunk_func(), part 1René Scharfe2012-05-09
* | | | | Merge branch 'jc/maint-blame-minimal'Junio C Hamano2012-04-23
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | blame: accept --need-minimalJunio C Hamano2012-04-11
| | |/ | |/|
* | | Merge branch 'zj/decimal-width'Junio C Hamano2012-02-20
|\ \ \
| * | | make lineno_width() from blame reusable for othersZbigniew Jędrzejewski-Szmek2012-02-14
| |/ /
* | | drop odd return value semantics from userdiff_configJeff King2012-02-07
|/ /
* | Merge branch 'maint-1.7.7' into maintJunio C Hamano2011-12-13
|\ \ | |/
| * blame: don't overflow time bufferJeff King2011-12-13
* | Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano2011-11-07
|\ \
| * | blame.c: Properly initialize strbuf after calling textconv_object(), againSebastian Schuberth2011-11-07
* | | Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano2011-11-01
|\ \ \ | |/ / | | / | |/ |/|
| * blame.c: Properly initialize strbuf after calling, textconv_object()Sebastian Schuberth2011-10-28
* | blame: add --line-porcelain output formatJeff King2011-05-09
* | blame: refactor porcelain outputJeff King2011-05-09
* | Merge branch 'js/blame-parsename'Junio C Hamano2011-05-06
|\ \
| * | blame: tolerate bogus e-mail addresses a bit betterJosh Stone2011-04-29
* | | blame: add --abbrev command line option and make it honor core.abbrevNamhyung Kim2011-04-05
|/ /
* | standardize brace placement in struct definitionsJonathan Nieder2011-03-16
* | Merge branch 'jn/parse-options-extra'Junio C Hamano2010-12-12
|\ \
| * | parse-options: Don't call parse_options_check() so muchStephen Boyd2010-12-06
* | | Merge branch 'kb/blame-author-email'Junio C Hamano2010-11-29
|\ \ \
| * | | blame: Add option to show author email instead of nameKevin Ballard2010-10-19
| |/ /
* | | Merge branch 'ks/no-textconv-symlink'Junio C Hamano2010-11-17
|\ \ \ | |/ / |/| / | |/