summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* doc: --recurse-submodules mostly applies to active submodulesDamien Robert2020-04-066-7/+9
* doc: be more precise on (fetch|push).recurseSubmodulesDamien Robert2020-04-064-8/+13
* doc: explain how to deactivate submodule.recurse completelyDamien Robert2020-04-061-0/+7
* doc: document --recurse-submodules for reset and restoreDamien Robert2020-04-065-3/+20
* doc: list all commands affected by submodule.recurseDamien Robert2020-04-062-3/+5
* The second batch post 2.26 cycleJunio C Hamano2020-03-261-0/+53
* Merge branch 'ah/force-pull-rebase-configuration'Junio C Hamano2020-03-263-11/+65
|\
| * pull: warn if the user didn't say whether to rebase or to mergeAlex Henrie2020-03-103-11/+65
* | Merge branch 'tg/retire-scripted-stash'Junio C Hamano2020-03-268-862/+31
|\ \
| * | stash: remove the stash.useBuiltin settingThomas Gummerer2020-03-058-860/+30
| * | stash: get git_stash_config at the top levelThomas Gummerer2020-03-031-3/+2
| |/
* | Merge branch 'jc/describe-misnamed-annotated-tag'Junio C Hamano2020-03-262-7/+28
|\ \
| * | describe: force long format for a name based on a mislocated tagJunio C Hamano2020-02-202-7/+28
* | | Merge branch 'at/rebase-fork-point-regression-fix'Junio C Hamano2020-03-263-13/+34
|\ \ \
| * | | rebase: --fork-point regression fixJunio C Hamano2020-02-113-13/+34
* | | | Merge branch 'bc/filter-process'Junio C Hamano2020-03-2620-75/+350
|\ \ \ \
| * | | | t0021: test filter metadata for additional casesbrian m. carlson2020-03-161-0/+45
| * | | | builtin/reset: compute checkout metadata for resetbrian m. carlson2020-03-162-4/+44
| * | | | builtin/rebase: compute checkout metadata for rebasesbrian m. carlson2020-03-163-1/+40
| * | | | builtin/clone: compute checkout metadata for clonesbrian m. carlson2020-03-162-4/+11
| * | | | builtin/checkout: compute checkout metadata for checkoutsbrian m. carlson2020-03-166-33/+68
| * | | | convert: provide additional metadata to filtersbrian m. carlson2020-03-1610-7/+83
| * | | | convert: permit passing additional metadata to filter processesbrian m. carlson2020-03-168-19/+51
| * | | | builtin/checkout: pass branch info down to checkout_worktreebrian m. carlson2020-03-121-16/+17
* | | | | Merge branch 'hi/gpg-prefer-check-signature'Junio C Hamano2020-03-266-78/+201
|\ \ \ \ \
| * | | | | gpg-interface: prefer check_signature() for GPG verificationHans Jerry Illikainen2020-03-154-78/+73
| * | | | | t: increase test coverage of signature verification outputHans Jerry Illikainen2020-03-152-0/+128
* | | | | | Merge branch 'bc/sha-256-part-1-of-4'Junio C Hamano2020-03-2628-141/+623
|\ \ \ \ \ \
| * | | | | | fast-import: add options for rewriting submodulesbrian m. carlson2020-02-283-5/+236
| * | | | | | fast-import: add a generic function to iterate over marksbrian m. carlson2020-02-281-24/+26
| * | | | | | fast-import: make find_marks work on any mark setbrian m. carlson2020-02-281-11/+10
| * | | | | | fast-import: add helper function for inserting mark object entriesbrian m. carlson2020-02-281-15/+22
| * | | | | | fast-import: permit reading multiple marks filesbrian m. carlson2020-02-281-14/+18
| * | | | | | commit: use expected signature header for SHA-256brian m. carlson2020-02-245-12/+62
| * | | | | | worktree: allow repository version 1brian m. carlson2020-02-241-6/+4
| * | | | | | init-db: move writing repo version into a functionbrian m. carlson2020-02-242-18/+25
| * | | | | | builtin/init-db: add environment variable for new repo hashbrian m. carlson2020-02-242-0/+15
| * | | | | | builtin/init-db: allow specifying hash algorithm on command linebrian m. carlson2020-02-244-9/+55
| * | | | | | setup: allow check_repository_format to read repository formatbrian m. carlson2020-02-244-5/+9
| * | | | | | t/helper: make repository tests hash independentbrian m. carlson2020-02-241-6/+4
| * | | | | | t/helper: initialize repository if necessarybrian m. carlson2020-02-241-0/+4
| * | | | | | t/helper/test-dump-split-index: initialize git repositorybrian m. carlson2020-02-241-0/+2
| * | | | | | t6300: make hash algorithm independentbrian m. carlson2020-02-241-1/+1
| * | | | | | t6300: abstract away SHA-1-specific constantsbrian m. carlson2020-02-241-9/+16
| * | | | | | t: use hash-specific lookup tables to define test constantsbrian m. carlson2020-02-241-15/+14
| * | | | | | repository: require a build flag to use SHA-256brian m. carlson2020-02-242-0/+6
| * | | | | | hex: add functions to parse hex object IDs in any algorithmbrian m. carlson2020-02-242-0/+32
| * | | | | | hex: introduce parsing variants taking hash algorithmsbrian m. carlson2020-02-242-7/+33
| * | | | | | hash: implement and use a context cloning functionbrian m. carlson2020-02-244-1/+46
| * | | | | | builtin/pack-objects: make hash agnosticbrian m. carlson2020-02-241-1/+1