summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/diff-no-index-initialize'Junio C Hamano2019-03-071-9/+11
|\
| * diff: reuse diff setup for --no-index caseJeff King2019-02-241-9/+11
* | Merge branch 'nd/completion-more-parameters'Junio C Hamano2019-03-076-0/+32
|\ \
| * | completion: add more parameter value completionNguyễn Thái Ngọc Duy2019-02-206-0/+32
* | | Merge branch 'ab/receive-pack-use-after-free-fix'Junio C Hamano2019-03-071-8/+15
|\ \ \
| * | | receive-pack: fix use-after-free bugÆvar Arnfjörð Bjarmason2019-02-201-8/+15
* | | | Merge branch 'jk/prune-optim'Junio C Hamano2019-03-071-12/+32
|\ \ \ \
| * | | | prune: check SEEN flag for reachabilityJeff King2019-02-141-5/+4
| * | | | prune: lazily perform reachability traversalJeff King2019-02-141-11/+32
| | |/ / | |/| |
* | | | Merge branch 'jh/trace2'Junio C Hamano2019-03-078-6/+55
|\ \ \ \
| * | | | trace2:data: add subverb for rebaseJeff Hostetler2019-02-221-0/+17
| * | | | trace2:data: add subverb to reset commandJeff Hostetler2019-02-221-0/+6
| * | | | trace2:data: add subverb to checkout commandJeff Hostetler2019-02-221-0/+7
| * | | | trace2:data: pack-objects: add trace2 regionsDerrick Stolee2019-02-221-1/+15
| * | | | trace2:data: add trace2 hook classificationJeff Hostetler2019-02-223-0/+6
| * | | | trace2: create new combined trace facilityJeff Hostetler2019-02-221-5/+4
| |/ / /
* | | | Merge branch 'rj/prune-packed-excess-args'Junio C Hamano2019-03-071-0/+5
|\ \ \ \
| * | | | prune-packed: check for too many argumentsRamsay Jones2019-02-111-0/+5
| | |/ / | |/| |
* | | | Merge branch 'en/combined-all-paths'Junio C Hamano2019-03-071-1/+5
|\ \ \ \
| * | | | log,diff-tree: add --combined-all-paths optionElijah Newren2019-02-071-1/+5
* | | | | Merge branch 'sc/pack-redundant'Junio C Hamano2019-03-071-140/+92
|\ \ \ \ \
| * | | | | pack-redundant: consistent sort methodJiang Xin2019-02-041-8/+16
| * | | | | pack-redundant: rename pack_list.all_objectsJiang Xin2019-02-041-19/+19
| * | | | | pack-redundant: new algorithm to find min packsSun Chao2019-02-041-127/+67
| * | | | | pack-redundant: delete redundant codeSun Chao2019-02-041-1/+0
| * | | | | pack-redundant: delay creation of unique_objectsJiang Xin2019-02-041-5/+10
* | | | | | Merge branch 'du/branch-show-current'Junio C Hamano2019-03-071-2/+23
|\ \ \ \ \ \
| * | | | | | branch: introduce --show-current display optionDaniels Umanovskis2018-10-261-2/+23
* | | | | | | Merge branch 'wh/author-committer-ident-config'Junio C Hamano2019-03-072-1/+3
|\ \ \ \ \ \ \
| * | | | | | | config: allow giving separate author and committer identsWilliam Hubbs2019-02-042-1/+3
* | | | | | | | Merge branch 'nd/diff-parseopt'Junio C Hamano2019-03-073-19/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | parse-options: allow ll_callback with OPTION_CALLBACKNguyễn Thái Ngọc Duy2019-01-272-5/+17
| * | | | | | | | parse-options: avoid magic return codesNguyễn Thái Ngọc Duy2019-01-272-12/+13
| * | | | | | | | parse-options: stop abusing 'callback' for lowlevel callbacksNguyễn Thái Ngọc Duy2019-01-273-7/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'tg/checkout-no-overlay'Junio C Hamano2019-03-071-35/+92
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | revert "checkout: introduce checkout.overlayMode config"Thomas Gummerer2019-02-041-7/+1
| * | | | | | | checkout: introduce checkout.overlayMode configThomas Gummerer2019-01-081-1/+7
| * | | | | | | checkout: introduce --{,no-}overlay optionThomas Gummerer2019-01-081-8/+58
| * | | | | | | checkout: factor out mark_cache_entry_for_checkout functionThomas Gummerer2019-01-021-31/+36
| * | | | | | | checkout: clarify commentThomas Gummerer2019-01-021-4/+4
* | | | | | | | Fix typos in translatable strings for v2.21.0Jean-Noël Avila2019-02-113-4/+4
* | | | | | | | Merge branch 'js/rebase-i-redo-exec-fix'Junio C Hamano2019-02-081-21/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Johannes Schindelin2019-02-061-21/+0
* | | | | | | | | Merge branch 'nd/checkout-noisy-unmerge'Junio C Hamano2019-02-081-7/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout: count and print -m paths separatelyNguyễn Thái Ngọc Duy2019-02-061-3/+8
| * | | | | | | | | checkout: update count-checkouts messagesNguyễn Thái Ngọc Duy2019-02-061-4/+4
* | | | | | | | | | Merge branch 'ss/describe-dirty-in-the-right-directory'Junio C Hamano2019-02-061-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | describe: setup working tree for --dirtySebastian Staudt2019-02-041-0/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sl/const'Junio C Hamano2019-02-063-10/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | various: tighten constness of some local variablesShahzad Lone2019-02-043-10/+10
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |