Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mh/blame-worktree' | Junio C Hamano | 2016-08-31 | 1 | -1/+2 |
|\ | |||||
| * | blame: fix segfault on untracked filesmh/blame-worktree | Thomas Gummerer | 2016-08-29 | 1 | -1/+2 |
* | | Merge branch 'jk/parseopt-string-list' | Junio C Hamano | 2016-08-08 | 1 | -1/+1 |
|\ \ | |||||
| * | | blame: drop strdup of string literaljk/parseopt-string-list | Eric Sunshine | 2016-08-03 | 1 | -1/+1 |
* | | | Merge branch 'jk/reflog-date' | Junio C Hamano | 2016-08-08 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | date: add "unix" format | Jeff King | 2016-07-27 | 1 | -0/+3 |
| * | | | Merge branch 'jc/deref-tag' into maint | Junio C Hamano | 2016-07-06 | 1 | -4/+2 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'mh/blame-worktree' | Junio C Hamano | 2016-07-25 | 1 | -1/+9 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | blame: allow to blame paths freshly added to the index | Mike Hommey | 2016-07-18 | 1 | -1/+9 |
| * | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maint | Junio C Hamano | 2016-04-29 | 1 | -0/+1 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'bc/cocci' | Junio C Hamano | 2016-07-19 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: convert struct diff_filespec to struct object_id | brian m. carlson | 2016-06-28 | 1 | -3/+3 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'dk/blame-move-no-reason-for-1-line-context' | Junio C Hamano | 2016-07-19 | 1 | -4/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | blame: require 0 context lines while finding moved lines with -Mks/blame-move-no-reason-for-1-line-contextdk/blame-move-no-reason-for-1-line-context | David Kastrup | 2016-05-29 | 1 | -4/+3 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jk/string-list-static-init' | Junio C Hamano | 2016-07-06 | 1 | -7/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | use string_list initializer consistentlyjk/string-list-static-init | Jeff King | 2016-06-13 | 1 | -1/+1 |
| * | | | | | | Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init | Junio C Hamano | 2016-06-13 | 1 | -6/+6 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | | | |||||
| | * | | | | blame,shortlog: don't make local option variables static | Jeff King | 2016-06-13 | 1 | -6/+6 |
* | | | | | | Merge branch 'jc/deref-tag' | Junio C Hamano | 2016-06-27 | 1 | -4/+2 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | blame, line-log: do not loop around deref_tag()jc/deref-tag | Junio C Hamano | 2016-06-14 | 1 | -4/+2 |
* | | | | | | pathspec: rename free_pathspec() to clear_pathspec()jc/clear-pathspec | Junio C Hamano | 2016-06-02 | 1 | -3/+3 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' | Junio C Hamano | 2016-04-13 | 1 | -0/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||||
| * | | | correct blame for files commited with CRLFtb/blame-force-read-cache-to-workaround-safe-crlf | Torsten Bögershausen | 2016-04-05 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge branch 'jk/tighten-alloc' | Junio C Hamano | 2016-02-26 | 1 | -4/+3 |
|\ \ \ | |||||
| * | | | convert trivial cases to FLEX_ARRAY macros | Jeff King | 2016-02-22 | 1 | -3/+1 |
| * | | | convert trivial cases to ALLOC_ARRAY | Jeff King | 2016-02-22 | 1 | -1/+2 |
* | | | | Merge branch 'nd/ita-cleanup' | Junio C Hamano | 2016-01-20 | 1 | -5/+0 |
|\ \ \ \ | |||||
| * | | | | blame: remove obsolete comment | Nguyễn Thái Ngọc Duy | 2015-08-25 | 1 | -5/+0 |
* | | | | | Merge branch 'ea/blame-progress' | Junio C Hamano | 2016-01-12 | 1 | -4/+30 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | blame: add support for --[no-]progress optionea/blame-progress | Edmundo Carmona Antoranz | 2015-12-16 | 1 | -4/+30 |
| | |_|/ | |/| | | |||||
| * | | | Merge branch 'mk/blame-error-message' into maint | Junio C Hamano | 2015-11-03 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/blame-first-parent' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+10 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'bc/object-id' | Junio C Hamano | 2015-12-10 | 1 | -28/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove get_object_hash. | brian m. carlson | 2015-11-20 | 1 | -12/+12 |
| * | | | | | | Convert struct object to object_id | brian m. carlson | 2015-11-20 | 1 | -16/+16 |
| * | | | | | | Add several uses of get_object_hash. | brian m. carlson | 2015-11-20 | 1 | -12/+12 |
* | | | | | | | Merge branch 'mk/blame-first-parent' | Jeff King | 2015-12-01 | 1 | -16/+14 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | blame: fix object casting regression | Jeff King | 2015-11-24 | 1 | -16/+14 |
* | | | | | | | Merge branch 'mk/blame-first-parent' | Junio C Hamano | 2015-11-03 | 1 | -14/+47 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | blame: allow blame --reverse --first-parent when it makes sensemk/blame-first-parent | Max Kirillov | 2015-10-30 | 1 | -2/+30 |
| * | | | | | | blame: extract find_single_final | Max Kirillov | 2015-10-30 | 1 | -12/+17 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'mk/blame-error-message' | Junio C Hamano | 2015-10-30 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | blame: fix option name in error messagemk/blame-error-message | Max Kirillov | 2015-10-26 | 1 | -1/+1 |
* | | | | | | Merge branch 'jk/war-on-sprintf' | Junio C Hamano | 2015-10-20 | 1 | -6/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | avoid sprintf and strcpy with flex arrays | Jeff King | 2015-10-05 | 1 | -2/+3 |
| * | | | | | | use sha1_to_hex_r() instead of strcpy | Jeff King | 2015-10-05 | 1 | -4/+4 |
* | | | | | | | Sync with 2.6.1 | Junio C Hamano | 2015-10-05 | 1 | -2/+7 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Sync with v2.5.4 | Junio C Hamano | 2015-09-28 | 1 | -2/+7 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Sync with 2.4.10 | Junio C Hamano | 2015-09-28 | 1 | -2/+7 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Sync with 2.3.10 | Junio C Hamano | 2015-09-28 | 1 | -2/+7 |
| | | |\ \ \ \ |