Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/pretty-formats' | Junio C Hamano | 2013-04-23 | 1 | -1/+1 |
|\ | |||||
| * | pretty: save commit encoding from logmsg_reencode if the caller needs it | Nguyễn Thái Ngọc Duy | 2013-04-18 | 1 | -1/+1 |
* | | blame: handle broken commit headers gracefully | René Scharfe | 2013-04-17 | 1 | -3/+8 |
|/ | |||||
* | logmsg_reencode: lazily load missing commit buffers | Jeff King | 2013-01-26 | 1 | -13/+0 |
* | logmsg_reencode: never return NULL | Jeff King | 2013-01-26 | 1 | -5/+4 |
* | Merge branch 'ap/log-mailmap' | Junio C Hamano | 2013-01-20 | 1 | -97/+86 |
|\ | |||||
| * | mailmap: simplify map_user() interface | Antoine Pelisse | 2013-01-10 | 1 | -75/+81 |
| * | Use split_ident_line to parse author and committer | Antoine Pelisse | 2013-01-07 | 1 | -38/+21 |
* | | Merge branch 'jc/blame-no-follow' | Junio C Hamano | 2013-01-14 | 1 | -1/+5 |
|\ \ | |/ |/| | |||||
| * | blame: pay attention to --no-follow | Junio C Hamano | 2012-09-21 | 1 | -1/+5 |
| * | Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -6/+3 |
| |\ | |||||
| * \ | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 1 | -4/+5 |
| |\ \ | |||||
| * \ \ | Merge branch 'jc/maint-blame-unique-abbrev' into maint | Junio C Hamano | 2012-07-11 | 1 | -4/+21 |
| |\ \ \ | |||||
* | | | | | pretty: remove reencode_commit_message() | Junio C Hamano | 2012-10-17 | 1 | -2/+3 |
* | | | | | Merge branch 'jc/maint-blame-no-such-path' | Junio C Hamano | 2012-09-17 | 1 | -16/+73 |
|\ \ \ \ \ | |||||
| * | | | | | blame: allow "blame file" in the middle of a conflicted merge | Junio C Hamano | 2012-09-11 | 1 | -24/+69 |
| * | | | | | blame $path: avoid getting fooled by case insensitive filesystems | Junio C Hamano | 2012-09-10 | 1 | -2/+14 |
| * | | | | | Merge branch 'jc/maint-blame-minimal' into maint | Junio C Hamano | 2012-05-01 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'nd/i18n-parseopt-help' | Junio C Hamano | 2012-09-07 | 1 | -23/+23 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | i18n: blame: mark parseopt strings for translation | Nguyễn Thái Ngọc Duy | 2012-08-20 | 1 | -23/+23 |
* | | | | | | | | Merge branch 'jk/maint-null-in-trees' | Junio C Hamano | 2012-08-27 | 1 | -4/+5 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | diff: do not use null sha1 as a sentinel value | Jeff King | 2012-07-29 | 1 | -4/+5 |
* | | | | | | | | Merge branch 'tr/void-diff-setup-done' | Junio C Hamano | 2012-08-22 | 1 | -6/+3 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | diff_setup_done(): return void | Thomas Rast | 2012-08-03 | 1 | -6/+3 |
| |/ / / / / | |||||
* | | | | | | Strip namelen out of ce_flags into a ce_namelen field | Thomas Gummerer | 2012-07-11 | 1 | -1/+2 |
* | | | | | | 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 |