summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2020-04-29Revert "commit-graph.c: introduce '--[no-]check-oids'"Libravatar Junio C Hamano1-8/+3
2020-04-28Merge branch 'mt/grep-cquote-path'Libravatar Junio C Hamano1-12/+34
2020-04-28Merge branch 'ds/log-exclude-decoration-config'Libravatar Junio C Hamano1-1/+15
2020-04-28Merge branch 'tb/diff-tree-with-notes'Libravatar Junio C Hamano1-0/+9
2020-04-28Merge branch 'js/stash-p-fix'Libravatar Junio C Hamano1-1/+1
2020-04-28Merge branch 'dl/libify-a-few'Libravatar Junio C Hamano4-700/+4
2020-04-28Merge branch 'jt/avoid-prefetch-when-able-in-diff'Libravatar Junio C Hamano1-3/+2
2020-04-28Merge branch 'ds/commit-graph-expiry-fix'Libravatar Junio C Hamano1-1/+1
2020-04-28Merge branch 'jc/log-no-mailmap'Libravatar Junio C Hamano2-1/+2
2020-04-28Merge branch 'jk/config-use-size-t'Libravatar Junio C Hamano2-2/+2
2020-04-28Merge branch 'bc/constant-memequal'Libravatar Junio C Hamano1-1/+22
2020-04-28push: anonymize URLs in error messages and warningsLibravatar Johannes Schindelin1-2/+4
2020-04-28rebase: save autostash entry into stash reflog on --quitLibravatar Denton Liu1-0/+1
2020-04-28push: unset PARSE_OPT_OPTARG for --recurse-submodulesLibravatar Denton Liu1-6/+3
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FLibravatar Denton Liu29-164/+156
2020-04-27rebase: display an error if --root and --fork-point are both providedLibravatar Elijah Newren1-0/+3
2020-04-24shallow.c: use '{commit,rollback}_shallow_file'Libravatar Taylor Blau1-2/+2
2020-04-22Merge branch 'jt/rebase-allow-duplicate'Libravatar Junio C Hamano1-0/+7
2020-04-22Merge branch 'en/rebase-no-keep-empty'Libravatar Junio C Hamano1-7/+10
2020-04-22Merge branch 'js/flush-prompt-before-interative-input'Libravatar Junio C Hamano1-10/+4
2020-04-22Merge branch 'ma/simplify-merge-config-parsing'Libravatar Junio C Hamano1-3/+5
2020-04-22Merge branch 'eb/format-patch-no-encode-headers'Libravatar Junio C Hamano1-0/+7
2020-04-22Merge branch 'dd/no-gpg-sign'Libravatar Junio C Hamano1-3/+4
2020-04-22Merge branch 'jk/use-quick-lookup-in-clone-for-tag-following'Libravatar Junio C Hamano1-1/+3
2020-04-22Merge branch 'jk/oid-array-cleanups'Libravatar Junio C Hamano8-8/+8
2020-04-22Merge branch 'en/pull-do-not-rebase-after-fast-forwarding'Libravatar Junio C Hamano1-1/+4
2020-04-22Merge branch 'rs/pull-options-sync-code-and-doc'Libravatar Junio C Hamano1-0/+18
2020-04-22Merge branch 'jt/connectivity-check-optim-in-partial-clone'Libravatar Junio C Hamano2-12/+2
2020-04-22receive-pack: compilation fixLibravatar Junio C Hamano1-1/+3
2020-04-20diff-tree.c: load notes machinery when requiredLibravatar Taylor Blau1-0/+9
2020-04-20grep: follow conventions for printing paths w/ unusual charsLibravatar Matheus Tavares1-12/+34
2020-04-16blame: use changed-path Bloom filtersLibravatar Derrick Stolee1-0/+10
2020-04-16tests: write commit-graph with Bloom filtersLibravatar Derrick Stolee2-5/+6
2020-04-16help: move list_config_help to builtin/helpLibravatar Emily Shaffer1-0/+86
2020-04-16log: add log.excludeDecoration config optionLibravatar Derrick Stolee1-1/+15
2020-04-15commit-graph.c: introduce '--[no-]check-oids'Libravatar Taylor Blau1-3/+8
2020-04-15commit-graph.h: replace 'commit_hex' with 'commits'Libravatar Taylor Blau1-3/+16
2020-04-15builtin/commit-graph.c: introduce split strategy 'replace'Libravatar Taylor Blau1-0/+2
2020-04-15builtin/commit-graph.c: introduce split strategy 'no-merge'Libravatar Taylor Blau1-1/+6
2020-04-15builtin/commit-graph.c: support for '--split[=<strategy>]'Libravatar Taylor Blau1-4/+22
2020-04-11merge: use skip_prefix to parse config keyLibravatar Martin Ă…gren1-3/+5
2020-04-11rebase --merge: optionally skip upstreamed commitsLibravatar Jonathan Tan1-0/+7
2020-04-11rebase: fix an incompatible-options error messageLibravatar Elijah Newren1-1/+1
2020-04-11rebase: reinstate --no-keep-emptyLibravatar Elijah Newren1-6/+9
2020-04-10parse_config_key(): return subsection len as size_tLibravatar Jeff King2-2/+2
2020-04-10interactive: refactor code asking the user for interactive inputLibravatar Johannes Schindelin1-10/+4
2020-04-10pull: pass --autostash to mergeLibravatar Denton Liu1-4/+5
2020-04-10merge: teach --autostash optionLibravatar Denton Liu3-2/+28
2020-04-10sequencer: extract perform_autostash() from rebaseLibravatar Denton Liu1-49/+0
2020-04-10rebase: generify create_autostash()Libravatar Denton Liu1-16/+16