| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jc/maint-blame-unique-abbrev' | Junio C Hamano | 2012-07-09 | 1 | -4/+21 |
|\ |
|
| * | blame: compute abbreviation width that ensures uniqueness | Junio C Hamano | 2012-07-02 | 1 | -4/+21 |
* | | builtin/blame.c: Fix a "Using plain integer as NULL pointer" warning | Ramsay Jones | 2012-05-14 | 1 | -1/+1 |
* | | blame: factor out helper for calling xdi_diff() | René Scharfe | 2012-05-09 | 1 | -22/+16 |
* | | blame: use hunk_func(), part 2 | René Scharfe | 2012-05-09 | 1 | -5/+13 |
* | | blame: use hunk_func(), part 1 | René Scharfe | 2012-05-09 | 1 | -5/+12 |
* | | Merge branch 'jc/maint-blame-minimal' | Junio C Hamano | 2012-04-23 | 1 | -0/+1 |
|\ \ |
|
| * | | blame: accept --need-minimal | Junio C Hamano | 2012-04-11 | 1 | -0/+1 |
* | | | Merge branch 'zj/decimal-width' | Junio C Hamano | 2012-02-20 | 1 | -15/+3 |
|\ \ \ |
|
| * | | | make lineno_width() from blame reusable for otherszj/decimal-width | Zbigniew Jędrzejewski-Szmek | 2012-02-14 | 1 | -15/+3 |
| |/ / |
|
* | | | drop odd return value semantics from userdiff_configjk/userdiff-config-simplify | Jeff King | 2012-02-07 | 1 | -7/+1 |
|/ / |
|
* | | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2011-12-13 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | blame: don't overflow time buffer | Jeff King | 2011-12-13 | 1 | -1/+1 |
* | | Merge branch 'ss/blame-textconv-fake-working-tree' | Junio C Hamano | 2011-11-07 | 1 | -4/+3 |
|\ \ |
|
| * | | blame.c: Properly initialize strbuf after calling textconv_object(), again | Sebastian Schuberth | 2011-11-07 | 1 | -4/+3 |
* | | | Merge branch 'ss/blame-textconv-fake-working-tree' | Junio C Hamano | 2011-11-01 | 1 | -1/+3 |
|\ \ \
| |/ /
| | /
| |/
|/| |
|
| * | blame.c: Properly initialize strbuf after calling, textconv_object() | Sebastian Schuberth | 2011-10-28 | 1 | -1/+3 |
* | | blame: add --line-porcelain output format | Jeff King | 2011-05-09 | 1 | -2/+8 |
* | | blame: refactor porcelain output | Jeff King | 2011-05-09 | 1 | -9/+16 |
* | | Merge branch 'js/blame-parsename' | Junio C Hamano | 2011-05-06 | 1 | -1/+1 |
|\ \ |
|
| * | | blame: tolerate bogus e-mail addresses a bit better | Josh Stone | 2011-04-29 | 1 | -1/+1 |
* | | | blame: add --abbrev command line option and make it honor core.abbrev | Namhyung Kim | 2011-04-05 | 1 | -1/+8 |
|/ / |
|
* | | standardize brace placement in struct definitions | Jonathan Nieder | 2011-03-16 | 1 | -2/+1 |
* | | Merge branch 'jn/parse-options-extra' | Junio C Hamano | 2010-12-12 | 1 | -2/+2 |
|\ \ |
|
| * | | parse-options: Don't call parse_options_check() so much | Stephen Boyd | 2010-12-06 | 1 | -2/+2 |
* | | | Merge branch 'kb/blame-author-email' | Junio C Hamano | 2010-11-29 | 1 | -6/+22 |
|\ \ \ |
|
| * | | | blame: Add option to show author email instead of name | Kevin Ballard | 2010-10-19 | 1 | -6/+22 |
| |/ / |
|
* | | | Merge branch 'ks/no-textconv-symlink' | Junio C Hamano | 2010-11-17 | 1 | -11/+22 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664'' | Kirill Smelkov | 2010-09-29 | 1 | -11/+22 |
* | | Merge branch 'maint' | Junio C Hamano | 2010-08-22 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | Typos in code comments, an error message, documentation | Ralf Wildenhues | 2010-08-22 | 1 | -2/+2 |
* | | Merge branch 'cc/find-commit-subject' | Junio C Hamano | 2010-08-18 | 1 | -15/+7 |
|\ \
| |/
|/| |
|
| * | blame: use find_commit_subject() instead of custom code | Christian Couder | 2010-07-23 | 1 | -15/+7 |
| * | Merge branch 'rs/diff-no-minimal' into maint | Junio C Hamano | 2010-06-21 | 1 | -1/+1 |
* | | Merge branch 'cp/textconv-cat-file' | Junio C Hamano | 2010-06-27 | 1 | -4/+4 |
|\ \ |
|
| * | | textconv: support for cat_file | Clément Poulain | 2010-06-18 | 1 | -4/+4 |
* | | | Merge branch 'ab/blame-textconv' | Junio C Hamano | 2010-06-27 | 1 | -13/+72 |
|\ \ \
| |/ / |
|
| * | | textconv: support for blame | Axel Bonnet | 2010-06-18 | 1 | -13/+72 |
| |/ |
|
* | | Merge branch 'gv/portable' | Junio C Hamano | 2010-06-21 | 1 | -4/+6 |
|\ \ |
|
| * | | Rewrite dynamic structure initializations to runtime assignment | Gary V. Vaughan | 2010-05-31 | 1 | -4/+6 |
* | | | Merge branch 'rs/diff-no-minimal' | Junio C Hamano | 2010-06-13 | 1 | -1/+1 |
| |/
|/| |
|
* | | Change C99 comments to old-style C comments | Tor Arntsen | 2010-06-07 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'maint' | Junio C Hamano | 2010-03-13 | 1 | -1/+1 |
* | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 | 1 | -0/+2477 |