summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* convert: convert get_cached_convert_stats_ascii to take an indexBrandon Williams2017-06-131-1/+2
* Merge branch 'tb/pull-ff-rebase-autostash'Junio C Hamano2017-06-051-11/+14
|\
| * pull: ff --rebase --autostash works in dirty repotb/pull-ff-rebase-autostashTyler Brazier2017-06-011-11/+14
* | Merge branch 'js/blame-lib'Junio C Hamano2017-06-052-2048/+65
|\ \
| * | blame: move entry prepend to libgitJeff Smith2017-05-251-14/+0
| * | blame: move scoreboard setup to libgitJeff Smith2017-05-251-276/+0
| * | blame: move scoreboard-related methods to libgitJeff Smith2017-05-251-1318/+0
| * | blame: move fake-commit-related methods to libgitJeff Smith2017-05-251-197/+0
| * | blame: move origin-related methods to libgitJeff Smith2017-05-251-72/+0
| * | blame: move core structures to headerJeff Smith2017-05-251-133/+1
| * | blame: create entry prepend functionJeff Smith2017-05-251-10/+15
| * | blame: create scoreboard setup functionJeff Smith2017-05-251-89/+101
| * | blame: create scoreboard init functionJeff Smith2017-05-251-3/+8
| * | blame: rework methods that determine 'final' commitJeff Smith2017-05-251-26/+23
| * | blame: wrap blame_sort and compare_blame_finalJeff Smith2017-05-251-8/+9
| * | blame: move progress updates to a scoreboard callbackJeff Smith2017-05-251-10/+17
| * | blame: make sanity_check use a callback in scoreboardJeff Smith2017-05-241-8/+19
| * | blame: move no_whole_file_rename flag to scoreboardJeff Smith2017-05-241-1/+3
| * | blame: move xdl_opts flags to scoreboardJeff Smith2017-05-241-3/+5
| * | blame: move show_root flag to scoreboardJeff Smith2017-05-241-1/+4
| * | blame: move reverse flag to scoreboardJeff Smith2017-05-241-9/+14
| * | blame: move contents_from to scoreboardJeff Smith2017-05-241-0/+4
| * | blame: move copy/move thresholds to scoreboardJeff Smith2017-05-241-18/+23
| * | blame: move stat counters to scoreboardJeff Smith2017-05-241-17/+17
| * | blame: rename nth_line functionJeff Smith2017-05-241-8/+8
| * | blame: rename ent_score functionJeff Smith2017-05-241-7/+7
| * | blame: rename coalesce functionJeff Smith2017-05-241-2/+2
| * | blame: rename origin-related functionsJeff Smith2017-05-241-29/+29
| * | blame: rename scoreboard structure to blame_scoreboardJeff Smith2017-05-241-29/+29
| * | blame: rename origin structure to blame_originJeff Smith2017-05-241-57/+57
| * | blame: remove unused parametersJeff Smith2017-05-241-15/+10
| * | blame: move textconv_object with related functionsJeff Smith2017-05-242-28/+1
| * | blame: remove unneeded dependency on blob.hJeff Smith2017-05-241-1/+0
* | | Merge branch 'mh/packed-ref-store-prep'Junio C Hamano2017-06-052-3/+3
|\ \ \
| * | | ref_store: take a `msg` parameter when deleting referencesMichael Haggerty2017-05-232-3/+3
| * | | Merge branch 'bc/object-id'Junio C Hamano2017-05-2338-311/+331
| |\ \ \
* | \ \ \ Merge branch 'mb/diff-default-to-indent-heuristics'Junio C Hamano2017-06-053-3/+3
|\ \ \ \ \
| * | | | | diff: have the diff-* builtins configure diff before initializing revisionsMarc Branchaud2017-05-093-3/+3
* | | | | | Merge branch 'ab/c-translators-comment-style'Junio C Hamano2017-06-043-10/+18
|\ \ \ \ \ \
| * | | | | | C style: use standard style for "TRANSLATORS" commentsab/c-translators-comment-styleÆvar Arnfjörð Bjarmason2017-05-313-10/+18
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jk/unbreak-am-h'Junio C Hamano2017-06-041-0/+3
|\ \ \ \ \ \
| * | | | | | am: handle "-h" argument earlierjk/unbreak-am-hJeff King2017-05-301-0/+3
| |/ / / / /
* | | | | | Merge branch 'ab/grep-preparatory-cleanup'Junio C Hamano2017-06-022-5/+22
|\ \ \ \ \ \
| * | | | | | grep: assert that threading is enabled when calling grep_{lock,unlock}ab/grep-preparatory-cleanupÆvar Arnfjörð Bjarmason2017-05-261-4/+4
| * | | | | | grep: given --threads with NO_PTHREADS=YesPlease, warnÆvar Arnfjörð Bjarmason2017-05-261-0/+13
| * | | | | | pack-objects: fix buggy warning about threadsÆvar Arnfjörð Bjarmason2017-05-261-1/+3
| * | | | | | grep: catch a missing enum in switch statementÆvar Arnfjörð Bjarmason2017-05-261-0/+2
| |/ / / / /
* | | | | | Merge branch 'jk/diff-blob'Junio C Hamano2017-06-024-36/+42
|\ \ \ \ \ \
| * | | | | | diff: use blob path for blob/file diffsJeff King2017-05-241-1/+2
| * | | | | | diff: use pending "path" if it is availableJeff King2017-05-241-1/+6
View Lorry Controller Status