summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cc/git-replay' into seenJunio C Hamano2023-05-171-0/+433
|\
| * SQUASH???Junio C Hamano2023-05-091-0/+2
| * replay: stop assuming replayed branches do not divergeElijah Newren2023-05-091-10/+34
| * replay: add --contained to rebase contained branchesElijah Newren2023-05-091-2/+10
| * replay: add --advance or 'cherry-pick' modeElijah Newren2023-05-091-9/+176
| * replay: disallow revision specific options and pathspecsChristian Couder2023-05-091-1/+26
| * replay: use standard revision rangesElijah Newren2023-05-091-17/+4
| * replay: make it a minimal server side commandElijah Newren2023-05-091-52/+27
| * replay: remove HEAD related sanity checkElijah Newren2023-05-091-7/+1
| * replay: remove progress and info outputElijah Newren2023-05-091-6/+1
| * replay: add an important FIXME comment about gpg signingElijah Newren2023-05-091-1/+1
| * replay: don't simplify historyElijah Newren2023-05-091-9/+6
| * replay: introduce pick_regular_commit()Elijah Newren2023-05-091-20/+34
| * replay: die() instead of failing assert()Elijah Newren2023-05-091-1/+6
| * replay: start using parse_options APIElijah Newren2023-05-091-12/+32
| * replay: introduce new builtinElijah Newren2023-05-091-0/+220
* | Merge branch 'tc/cat-file-z-use-cquote' into seenJunio C Hamano2023-05-171-0/+19
|\ \
| * | cat-file: quote-format name in error when using -zToon Claes2023-05-101-0/+19
* | | Merge branch 'jc/pack-ref-exclude-include' into seenJunio C Hamano2023-05-171-4/+27
|\ \ \
| * | | pack-refs: teach pack-refs --include optionJohn Cai2023-05-121-2/+13
| * | | pack-refs: teach --exclude option to exclude refs from being packedJohn Cai2023-05-121-4/+16
| | |/ | |/|
* | | Merge branch 'es/recurse-submodules-option-is-a-bool' into seenJunio C Hamano2023-05-173-9/+25
|\ \ \
| * | | usage: clarify --recurse-submodules as a booleanEmily Shaffer2023-04-103-9/+25
* | | | Merge branch 'rn/sparse-diff-index' into seenJunio C Hamano2023-05-171-0/+9
|\ \ \ \
| * | | | diff-index: enable sparse indexRaghul Nanth A2023-04-101-0/+9
| |/ / /
* | | | Merge branch 'ja/worktree-orphan' into seenJunio C Hamano2023-05-171-10/+217
|\ \ \ \
| * | | | worktree add: emit warn when there is a bad HEADJacob Abel2023-05-171-5/+29
| * | | | worktree add: extend DWIM to infer --orphanJacob Abel2023-05-171-1/+113
| * | | | worktree add: introduce "try --orphan" hintJacob Abel2023-05-171-0/+26
| * | | | worktree add: add --orphan flagJacob Abel2023-05-171-11/+56
| * | | | worktree add: include -B in usage docsJacob Abel2023-05-171-1/+1
* | | | | Merge branch 'cb/checkout-same-branch-twice' into seenJunio C Hamano2023-05-171-8/+24
|\ \ \ \ \
| * | | | | checkout/switch: disallow checking out same branch in multiple worktreesCarlo Marcelo Arenas Belón2023-01-201-8/+24
* | | | | | Merge branch 'tk/pull-conflict-suggest-rebase-merge-not-rebase-true' into seenJunio C Hamano2023-05-171-4/+4
|\ \ \ \ \ \
| * | | | | | pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"Tao Klerks2023-02-131-4/+4
| |/ / / / /
* | | | | | Merge branch 'so/diff-merges-more' into seenJunio C Hamano2023-05-171-0/+4
|\ \ \ \ \ \
| * | | | | | diff-merges: implement log.diffMerges-m-imply-p configSergey Organov2022-12-181-0/+2
| * | | | | | diff-merges: implement [no-]hide option and log.diffMergesHide configSergey Organov2022-12-181-0/+2
* | | | | | | Merge branch 'tb/refs-exclusion-and-packed-refs' into seenJunio C Hamano2023-05-174-11/+11
|\ \ \ \ \ \ \
| * | | | | | | builtin/receive-pack.c: avoid enumerating hidden referencesTaylor Blau2023-05-151-1/+2
| * | | | | | | revision.h: store hidden refs in a `strvec`Taylor Blau2023-05-151-2/+2
| * | | | | | | builtin/for-each-ref.c: add `--exclude` optionTaylor Blau2023-05-151-0/+1
| * | | | | | | ref-filter: add `ref_filter_clear()`Jeff King2023-05-153-2/+3
| * | | | | | | ref-filter.h: provide `REF_FILTER_INIT`Jeff King2023-05-153-6/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'zh/ls-files-format-atoms' into seenJunio C Hamano2023-05-171-0/+27
|\ \ \ \ \ \ \
| * | | | | | | ls-files: add %(objectsize) atom to format optionZheNing Hu2023-05-141-0/+25
| * | | | | | | ls-files: add %(objecttype) atom to format optionZheNing Hu2023-05-141-0/+2
| |/ / / / / /
* | | | | | | Merge branch 'ps/fetch-cleanups' into seenJunio C Hamano2023-05-171-68/+79
|\ \ \ \ \ \ \
| * | | | | | | fetch: use `fetch_config` to store "submodule.fetchJobs" valuePatrick Steinhardt2023-05-171-5/+6
| * | | | | | | fetch: use `fetch_config` to store "fetch.parallel" valuePatrick Steinhardt2023-05-171-7/+8
View Lorry Controller Status