summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/rebase-backend'Junio C Hamano2020-03-121-1/+1
|\
| * i18n: unmark a message in rebase.cJiang Xin2020-03-111-1/+1
* | Merge branch 'pb/am-show-current-patch'Junio C Hamano2020-03-091-20/+76
|\ \
| * | am: support --show-current-patch=diff to retrieve .git/rebase-apply/patchPaolo Bonzini2020-02-201-2/+7
| * | am: support --show-current-patch=raw as a synonym for--show-current-patchPaolo Bonzini2020-02-201-6/+53
| * | am: convert "resume" variable to a structPaolo Bonzini2020-02-201-14/+18
* | | Merge branch 'am/pathspec-f-f-more'Junio C Hamano2020-03-092-44/+63
|\ \ \
| * | | stash push: support the --pathspec-from-file optionAlexandr Miloslavskiy2020-02-191-0/+20
| * | | stash: eliminate crude option parsingAlexandr Miloslavskiy2020-02-191-38/+21
| * | | rm: support the --pathspec-from-file optionAlexandr Miloslavskiy2020-02-191-6/+22
| |/ /
* | | Merge branch 'hi/gpg-use-check-signature'Junio C Hamano2020-03-051-7/+4
|\ \ \
| * | | Revert "gpg-interface: prefer check_signature() for GPG verification"Junio C Hamano2020-02-281-7/+4
* | | | Merge branch 'be/describe-multiroot'Junio C Hamano2020-03-051-4/+18
|\ \ \ \
| * | | | describe: don't abort too early when searching tagsBenno Evers2020-02-261-4/+18
* | | | | Merge branch 'ag/rebase-remove-redundant-code'Junio C Hamano2020-03-051-9/+1
|\ \ \ \ \
| * | | | | builtin/rebase: remove a call to get_oid() on `options.switch_to'Alban Gruin2020-02-261-9/+1
| * | | | | Merge branch 'pb/do-not-recurse-grep-no-index' into maintJunio C Hamano2020-02-141-2/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'nd/switch-and-restore' into maintJunio C Hamano2020-02-141-0/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'hw/commit-advise-while-rejecting' into maintJunio C Hamano2020-02-141-0/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'es/recursive-single-branch-clone'Junio C Hamano2020-03-052-6/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | clone: pass --single-branch during --recurse-submodulesEmily Shaffer2020-02-252-2/+23
| * | | | | | | | submodule--helper: use C99 named initializerEmily Shaffer2020-02-251-4/+7
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/nth-packed-object-id'Junio C Hamano2020-03-052-24/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | packed_object_info(): use object_id for returning delta baseJeff King2020-02-241-1/+1
| * | | | | | | | pack-objects: use object_id struct in pack-reuse codeJeff King2020-02-241-4/+5
| * | | | | | | | pack-objects: convert oe_set_delta_ext() to use object_idJeff King2020-02-241-1/+1
| * | | | | | | | pack-objects: read delta base oid into object_id structJeff King2020-02-241-17/+18
| * | | | | | | | nth_packed_object_oid(): use customary integer returnJeff King2020-02-241-2/+2
* | | | | | | | | Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'Junio C Hamano2020-03-051-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase: refuse to switch to branch already checked out elsewhereEric Sunshine2020-02-241-2/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'hv/receive-denycurrent-everywhere'Junio C Hamano2020-03-051-17/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | receive.denyCurrentBranch: respect all worktreesHariom Verma2020-02-241-17/+19
| |/ / / / / / / /
* | | | | | | | | Merge branch 'es/worktree-avoid-duplication-fix'Junio C Hamano2020-03-051-8/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | worktree: don't allow "add" validation to be fooled by suffix matchingEric Sunshine2020-02-241-8/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'mr/bisect-in-c-1'Junio C Hamano2020-03-051-56/+67
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bisect: libify `check_good_are_ancestors_of_bad` and its dependentsPranit Bauva2020-02-191-1/+10
| * | | | | | | | | bisect--helper: return error codes from `cmd_bisect__helper()`Pranit Bauva2020-02-191-1/+1
| * | | | | | | | | bisect--helper: introduce new `decide_next()` functionTanushree Tumane2020-02-191-32/+34
| * | | | | | | | | bisect--helper: change `retval` to `res`Tanushree Tumane2020-02-191-26/+26
| * | | | | | | | | bisect--helper: convert `vocab_*` char pointers to char arraysMiriam Rubio2020-02-191-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ds/sparse-add'Junio C Hamano2020-03-051-32/+109
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sparse-checkout: work with Windows pathsDerrick Stolee2020-02-111-0/+3
| * | | | | | | | | sparse-checkout: create 'add' subcommandDerrick Stolee2020-02-111-6/+66
| * | | | | | | | | sparse-checkout: extract pattern update from 'set' subcommandDerrick Stolee2020-02-111-18/+26
| * | | | | | | | | sparse-checkout: extract add_patterns_from_input()Derrick Stolee2020-02-111-29/+35
* | | | | | | | | | Merge branch 'rs/micro-cleanups'Junio C Hamano2020-03-021-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | use strpbrk(3) to search for characters from a given setRené Scharfe2020-02-241-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ds/partial-clone-fixes'Junio C Hamano2020-03-021-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | partial-clone: avoid fetching when looking for objectsDerrick Stolee2020-02-221-5/+5
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'en/rebase-backend'Junio C Hamano2020-03-021-78/+179
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |