summaryrefslogtreecommitdiff
path: root/builtin/blame.c
AgeCommit message (Expand)AuthorFilesLines
2012-09-11blame: allow "blame file" in the middle of a conflicted mergeLibravatar Junio C Hamano1-24/+69
2012-09-11Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Libravatar Junio C Hamano1-6/+3
2012-09-10blame $path: avoid getting fooled by case insensitive filesystemsLibravatar Junio C Hamano1-2/+14
2012-09-10Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Libravatar Junio C Hamano1-4/+5
2012-09-07Merge branch 'nd/i18n-parseopt-help'Libravatar Junio C Hamano1-23/+23
2012-08-27Merge branch 'jk/maint-null-in-trees'Libravatar Junio C Hamano1-4/+5
2012-08-22Merge branch 'tr/void-diff-setup-done'Libravatar Junio C Hamano1-6/+3
2012-08-20i18n: blame: mark parseopt strings for translationLibravatar Nguyễn Thái Ngọc Duy1-23/+23
2012-08-03diff_setup_done(): return voidLibravatar Thomas Rast1-6/+3
2012-07-29diff: do not use null sha1 as a sentinel valueLibravatar Jeff King1-4/+5
2012-07-11Merge branch 'jc/maint-blame-unique-abbrev' into maintLibravatar Junio C Hamano1-4/+21
2012-07-11Strip namelen out of ce_flags into a ce_namelen fieldLibravatar Thomas Gummerer1-1/+2
2012-07-09Merge branch 'jc/maint-blame-unique-abbrev'Libravatar Junio C Hamano1-4/+21
2012-07-02blame: compute abbreviation width that ensures uniquenessLibravatar Junio C Hamano1-4/+21
2012-05-14builtin/blame.c: Fix a "Using plain integer as NULL pointer" warningLibravatar Ramsay Jones1-1/+1
2012-05-09blame: factor out helper for calling xdi_diff()Libravatar René Scharfe1-22/+16
2012-05-09blame: use hunk_func(), part 2Libravatar René Scharfe1-5/+13
2012-05-09blame: use hunk_func(), part 1Libravatar René Scharfe1-5/+12
2012-05-01Merge branch 'jc/maint-blame-minimal' into maintLibravatar Junio C Hamano1-0/+1
2012-04-23Merge branch 'jc/maint-blame-minimal'Libravatar Junio C Hamano1-0/+1
2012-04-11blame: accept --need-minimalLibravatar Junio C Hamano1-0/+1
2012-02-20Merge branch 'zj/decimal-width'Libravatar Junio C Hamano1-15/+3
2012-02-14make lineno_width() from blame reusable for othersLibravatar Zbigniew Jędrzejewski-Szmek1-15/+3
2012-02-07drop odd return value semantics from userdiff_configLibravatar Jeff King1-7/+1
2011-12-13Merge branch 'maint-1.7.7' into maintLibravatar Junio C Hamano1-1/+1
2011-12-13blame: don't overflow time bufferLibravatar Jeff King1-1/+1
2011-11-07Merge branch 'ss/blame-textconv-fake-working-tree'Libravatar Junio C Hamano1-4/+3
2011-11-07blame.c: Properly initialize strbuf after calling textconv_object(), againLibravatar Sebastian Schuberth1-4/+3
2011-11-01Merge branch 'ss/blame-textconv-fake-working-tree'Libravatar Junio C Hamano1-1/+3
2011-10-28blame.c: Properly initialize strbuf after calling, textconv_object()Libravatar Sebastian Schuberth1-1/+3
2011-05-09blame: add --line-porcelain output formatLibravatar Jeff King1-2/+8
2011-05-09blame: refactor porcelain outputLibravatar Jeff King1-9/+16
2011-05-06Merge branch 'js/blame-parsename'Libravatar Junio C Hamano1-1/+1
2011-04-29blame: tolerate bogus e-mail addresses a bit betterLibravatar Josh Stone1-1/+1
2011-04-05blame: add --abbrev command line option and make it honor core.abbrevLibravatar Namhyung Kim1-1/+8
2011-03-16standardize brace placement in struct definitionsLibravatar Jonathan Nieder1-2/+1
2010-12-12Merge branch 'jn/parse-options-extra'Libravatar Junio C Hamano1-2/+2
2010-12-06parse-options: Don't call parse_options_check() so muchLibravatar Stephen Boyd1-2/+2
2010-11-29Merge branch 'kb/blame-author-email'Libravatar Junio C Hamano1-6/+22
2010-11-17Merge branch 'ks/no-textconv-symlink'Libravatar Junio C Hamano1-11/+22
2010-10-19blame: Add option to show author email instead of nameLibravatar Kevin Ballard1-6/+22
2010-09-29blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''Libravatar Kirill Smelkov1-11/+22
2010-08-22Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
2010-08-22Typos in code comments, an error message, documentationLibravatar Ralf Wildenhues1-2/+2
2010-08-18Merge branch 'cc/find-commit-subject'Libravatar Junio C Hamano1-15/+7
2010-07-23blame: use find_commit_subject() instead of custom codeLibravatar Christian Couder1-15/+7
2010-06-27Merge branch 'cp/textconv-cat-file'Libravatar Junio C Hamano1-4/+4
2010-06-27Merge branch 'ab/blame-textconv'Libravatar Junio C Hamano1-13/+72
2010-06-21Merge branch 'gv/portable'Libravatar Junio C Hamano1-4/+6
2010-06-21Merge branch 'rs/diff-no-minimal' into maintLibravatar Junio C Hamano1-1/+1