summaryrefslogtreecommitdiff
path: root/builtin/blame.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-111-6/+3
|\
| * diff_setup_done(): return voidThomas Rast2012-08-031-6/+3
* | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-101-4/+5
|\ \
| * | diff: do not use null sha1 as a sentinel valueJeff King2012-07-291-4/+5
| |/
* | Merge branch 'jc/maint-blame-unique-abbrev' into maintJunio C Hamano2012-07-111-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
* | | Merge branch 'kb/blame-author-email'Junio C Hamano2010-11-291-6/+22
|\ \ \
| * | | blame: Add option to show author email instead of nameKevin Ballard2010-10-191-6/+22
| |/ /
* | | Merge branch 'ks/no-textconv-symlink'Junio C Hamano2010-11-171-11/+22
|\ \ \ | |/ / |/| / | |/
| * blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''Kirill Smelkov2010-09-291-11/+22
* | Merge branch 'maint'Junio C Hamano2010-08-221-2/+2
|\ \ | |/
| * Typos in code comments, an error message, documentationRalf Wildenhues2010-08-221-2/+2
* | Merge branch 'cc/find-commit-subject'Junio C Hamano2010-08-181-15/+7
|\ \ | |/ |/|
| * blame: use find_commit_subject() instead of custom codeChristian Couder2010-07-231-15/+7
| * Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-211-1/+1
* | Merge branch 'cp/textconv-cat-file'Junio C Hamano2010-06-271-4/+4
|\ \
| * | textconv: support for cat_fileClément Poulain2010-06-181-4/+4
* | | Merge branch 'ab/blame-textconv'Junio C Hamano2010-06-271-13/+72
|\ \ \ | |/ /
| * | textconv: support for blameAxel Bonnet2010-06-181-13/+72
| |/
* | Merge branch 'gv/portable'Junio C Hamano2010-06-211-4/+6
|\ \
| * | Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan2010-05-311-4/+6
* | | Merge branch 'rs/diff-no-minimal'Junio C Hamano2010-06-131-1/+1
| |/ |/|
* | Change C99 comments to old-style C commentsTor Arntsen2010-06-071-1/+1
|/
* Merge branch 'maint'Junio C Hamano2010-03-131-1/+1
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+2477
View Lorry Controller Status