summaryrefslogtreecommitdiff
path: root/builtin/blame.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mh/blame-worktree'Junio C Hamano2016-08-311-1/+2
|\
| * blame: fix segfault on untracked filesmh/blame-worktreeThomas Gummerer2016-08-291-1/+2
* | Merge branch 'jk/parseopt-string-list'Junio C Hamano2016-08-081-1/+1
|\ \
| * | blame: drop strdup of string literaljk/parseopt-string-listEric Sunshine2016-08-031-1/+1
* | | Merge branch 'jk/reflog-date'Junio C Hamano2016-08-081-0/+3
|\ \ \
| * | | date: add "unix" formatJeff King2016-07-271-0/+3
| * | | Merge branch 'jc/deref-tag' into maintJunio C Hamano2016-07-061-4/+2
| |\ \ \
* | \ \ \ Merge branch 'mh/blame-worktree'Junio C Hamano2016-07-251-1/+9
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | blame: allow to blame paths freshly added to the indexMike Hommey2016-07-181-1/+9
| * | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maintJunio C Hamano2016-04-291-0/+1
| |\ \ \ \
* | \ \ \ \ Merge branch 'bc/cocci'Junio C Hamano2016-07-191-3/+3
|\ \ \ \ \ \
| * | | | | | diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-281-3/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'dk/blame-move-no-reason-for-1-line-context'Junio C Hamano2016-07-191-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-contextDavid Kastrup2016-05-291-4/+3
| |/ / / / /
* | | | | | Merge branch 'jk/string-list-static-init'Junio C Hamano2016-07-061-7/+7
|\ \ \ \ \ \
| * | | | | | use string_list initializer consistentlyjk/string-list-static-initJeff King2016-06-131-1/+1
| * | | | | | Merge branch 'jk/parseopt-string-list' into jk/string-list-static-initJunio C Hamano2016-06-131-6/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | blame,shortlog: don't make local option variables staticJeff King2016-06-131-6/+6
* | | | | | Merge branch 'jc/deref-tag'Junio C Hamano2016-06-271-4/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | blame, line-log: do not loop around deref_tag()jc/deref-tagJunio C Hamano2016-06-141-4/+2
* | | | | | pathspec: rename free_pathspec() to clear_pathspec()jc/clear-pathspecJunio C Hamano2016-06-021-3/+3
| |/ / / / |/| | | |
* | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'Junio C Hamano2016-04-131-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | correct blame for files commited with CRLFtb/blame-force-read-cache-to-workaround-safe-crlfTorsten Bögershausen2016-04-051-0/+1
| |/ /
* | | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-261-4/+3
|\ \ \
| * | | convert trivial cases to FLEX_ARRAY macrosJeff King2016-02-221-3/+1
| * | | convert trivial cases to ALLOC_ARRAYJeff King2016-02-221-1/+2
* | | | Merge branch 'nd/ita-cleanup'Junio C Hamano2016-01-201-5/+0
|\ \ \ \
| * | | | blame: remove obsolete commentNguyễn Thái Ngọc Duy2015-08-251-5/+0
* | | | | Merge branch 'ea/blame-progress'Junio C Hamano2016-01-121-4/+30
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | blame: add support for --[no-]progress optionea/blame-progressEdmundo Carmona Antoranz2015-12-161-4/+30
| | |_|/ | |/| |
| * | | Merge branch 'mk/blame-error-message' into maintJunio C Hamano2015-11-031-1/+1
| |\ \ \
| * \ \ \ Merge branch 'jk/blame-first-parent' into maintJunio C Hamano2015-10-161-1/+10
| |\ \ \ \
* | \ \ \ \ Merge branch 'bc/object-id'Junio C Hamano2015-12-101-28/+28
|\ \ \ \ \ \
| * | | | | | Remove get_object_hash.brian m. carlson2015-11-201-12/+12
| * | | | | | Convert struct object to object_idbrian m. carlson2015-11-201-16/+16
| * | | | | | Add several uses of get_object_hash.brian m. carlson2015-11-201-12/+12
* | | | | | | Merge branch 'mk/blame-first-parent'Jeff King2015-12-011-16/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | blame: fix object casting regressionJeff King2015-11-241-16/+14
* | | | | | | Merge branch 'mk/blame-first-parent'Junio C Hamano2015-11-031-14/+47
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | blame: allow blame --reverse --first-parent when it makes sensemk/blame-first-parentMax Kirillov2015-10-301-2/+30
| * | | | | | blame: extract find_single_finalMax Kirillov2015-10-301-12/+17
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mk/blame-error-message'Junio C Hamano2015-10-301-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | blame: fix option name in error messagemk/blame-error-messageMax Kirillov2015-10-261-1/+1
* | | | | | Merge branch 'jk/war-on-sprintf'Junio C Hamano2015-10-201-6/+7
|\ \ \ \ \ \
| * | | | | | avoid sprintf and strcpy with flex arraysJeff King2015-10-051-2/+3
| * | | | | | use sha1_to_hex_r() instead of strcpyJeff King2015-10-051-4/+4
* | | | | | | Sync with 2.6.1Junio C Hamano2015-10-051-2/+7
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Sync with v2.5.4Junio C Hamano2015-09-281-2/+7
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Sync with 2.4.10Junio C Hamano2015-09-281-2/+7
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Sync with 2.3.10Junio C Hamano2015-09-281-2/+7
| | | |\ \ \ \