summaryrefslogtreecommitdiff
path: root/builtin/blame.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/blame-code-cleanup' into maintJunio C Hamano2017-03-281-17/+8
|\
| * blame: move blame_entry duplication to add_blame_entry()rs/blame-code-cleanupRené Scharfe2017-03-111-17/+8
* | use oid_to_hex_r() for converting struct object_id hashes to hex stringsRené Scharfe2017-01-301-2/+2
* | Merge branch 'jk/blame-fixes'Junio C Hamano2017-01-181-10/+17
|\ \
| * | blame: output porcelain "previous" header for each filejk/blame-fixesJeff King2017-01-071-9/+14
| * | blame: handle --no-abbrevJeff King2017-01-071-0/+2
| * | blame: fix alignment with --abbrev=40Jeff King2017-01-071-1/+1
| |/
* | diff: retire "compaction" heuristicsjc/retire-compaction-heuristicsJunio C Hamano2016-12-231-3/+2
* | Merge branch 'jc/blame-reverse'Junio C Hamano2016-10-101-2/+40
|\ \
| * | blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."jc/blame-reverseJunio C Hamano2016-06-141-0/+38
| * | blame: improve diagnosis for "--reverse NEW"Junio C Hamano2016-06-141-2/+2
* | | Merge branch 'jc/blame-abbrev'Junio C Hamano2016-10-061-1/+1
|\ \ \ | | |/ | |/|
| * | blame: use DEFAULT_ABBREV macrojc/blame-abbrevJunio C Hamano2016-09-281-1/+1
* | | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-261-0/+12
|\ \ \
| * | | blame: honor the diff heuristic options and configMichael Haggerty2016-09-191-0/+12
* | | | Merge branch 'va/i18n'Junio C Hamano2016-09-211-8/+10
|\ \ \ \
| * | | | i18n: blame: mark error messages for translationVasco Almeida2016-09-151-8/+10
| | |/ / | |/| |
* | | | builtin/blame: convert file to use struct object_idbrian m. carlson2016-09-071-14/+14
* | | | builtin: convert textconv_object to use struct object_idbrian m. carlson2016-09-071-6/+6
* | | | builtin/blame: convert struct origin to use struct object_idbrian m. carlson2016-09-071-20/+20
* | | | cache: convert struct cache_entry to use struct object_idbrian m. carlson2016-09-071-1/+1
|/ / /
* | | 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
|\ \ \ \ \ | |_|/ / / |/| | | |
View Lorry Controller Status