Repository navigation

VMAWIP: rebase merge commits - #1491

Draft

dscho wants to merge 252 commits into

gitgitgadget:nextfrom

dscho:sequencer-rebase-merge-commits

Draft

VMAWIP: rebase merge commits#1491
dscho wants to merge 252 commits into
gitgitgadget:nextfrom
dscho:sequencer-rebase-merge-commits

This pull request is big! We're only showing the most recent 250 commits

Commits on Dec 16, 2022
- Merge branch 'jh/t7527-unflake-by-forcing-cookie' into next
  gitster
  committed
  d64198c
- Merge branch 'ab/t5314-avoid-losing-exit-status' into next
  gitster
  committed
  40f3acd
- Merge branch 'ab/t7600-avoid-losing-exit-status-of-git' into next
  gitster
  committed
  ef89e4f
- Merge branch 'ab/t4023-avoid-losing-exit-status-of-diff' into next
  gitster
  committed
  75c7a06
- Merge branch 'jh/fsmonitor-darwin-modernize' into next
  gitster
  committed
  197e1f8
- Merge branch 'js/t3920-shell-and-or-fix' into next
  gitster
  committed
  59536ed
- Merge branch 'rs/t3920-crlf-eating-grep-fix' into next
  gitster
  committed
  56ff27b
- Merge branch 'jk/avoid-redef-system-functions-2.30' into next
  gitster
  committed
  aa101df
- Merge branch 'jk/avoid-redef-system-functions' into next
  gitster
  committed
  55f7102
- Merge branch 'rs/diff-parseopts' into next
  gitster
  committed
  6fdfd67
- Merge branch 'sx/pthread-error-check-fix' into next
  gitster
  committed
  6084815
- Merge branch 'aw/complete-case-insensitive' into next
  gitster
  committed
  341974c
- Merge branch 'rr/status-untracked-advice' into next
  gitster
  committed
  bed7d84
- Merge branch 'rj/branch-copy-and-rename' into next
  gitster
  committed
  b88fa41
- Merge branch 'sg/help-autocorrect-config-fix' into next
  gitster
  committed
  edcf99f
- Merge branch 'jt/http-fetch-trace2-report-name' into next
  gitster
  committed
  b26e38c
- Merge branch 'jk/unused-post-2.39' into next
  gitster
  committed
  4ce4a86
- Merge branch 'jk/server-supports-v2-cleanup' into next
  gitster
  committed
  9b995dc
- Merge branch 'rs/am-parse-options-cleanup' into next
  gitster
  committed
  9013ff2
- Merge branch 'rs/clear-commit-marks-cleanup' into next
  gitster
  committed
  a9e52a7
- Merge branch 'rs/reflog-expiry-cleanup' into next
  gitster
  committed
  8165a62
- Merge branch 'rs/clarify-error-in-write-loose-object' into next
  gitster
  committed
  8ef4588
- Merge branch 'jk/ref-filter-error-reporting-fix' into next
  gitster
  committed
  8135d51
- Merge branch 'pg/diff-stat-unmerged-regression-fix' into next
  gitster
  committed
  2a61376
- Merge branch 'sk/remove-duplicate-includes' into next
  gitster
  committed
  846bc84
- Merge branch 'ab/darwin-default-to-sha1dc' into next
  gitster
  committed
  31fb33b
Commits on Dec 19, 2022
- Sync with 'master'
  gitster
  committed
  91a2055
Commits on Dec 20, 2022
- Merge branch 'ss/pull-v-recurse-fix' into next
  gitster
  committed
  21f91dc
- Merge branch 'sa/git-var-sequence-editor' into next
  gitster
  committed
  a573767
Commits on Dec 26, 2022
- Merge branch 'lk/line-range-parsing-fix' into next
  gitster
  committed
  216226a
- Merge branch 'ds/bundle-uri-4' into next
  gitster
  committed
  6d7c21c
- Merge branch 'ew/format-patch-mboxrd' into next
  gitster
  committed
  bb6cc9e
- Merge branch 'sk/win32-pthread-exit-fix' into next
  gitster
  committed
  ebcb1fe
- Merge branch 'ps/fsync-refs-fix' into next
  gitster
  committed
  6358875
- Merge branch 'ab/bundle-wo-args' into next
  gitster
  committed
  b086677
- Sync with 'master'
  gitster
  committed
  74172e4
Commits on Dec 28, 2022
- Merge branch 'sa/cat-file-mailmap--batch-check' into next
  gitster
  committed
  57531d3
- Merge branch 'jt/avoid-lazy-fetch-commits' into next
  gitster
  committed
  35276d1
- Merge branch 'dh/mingw-ownership-check-typofix' into next
  gitster
  committed
  3753a46
- Merge branch 'sg/test-oid-wo-incomplete-line' into next
  gitster
  committed
  8dadf8c
- Merge branch 'ar/typofix-gitattributes-doc' into next
  gitster
  committed
  e193a15
- Merge branch 'km/doc-branch-start-point' into next
  gitster
  committed
  0c24f1c
- Merge branch 'ab/bundle-wo-args' into next
  gitster
  committed
  6ae8fc1
- Merge branch 'ab/no-more-git-global-super-prefix' into next
  gitster
  committed
  126b1fb
- Sync with 'master'
  gitster
  committed
  cfb4c9d
Commits on Jan 2, 2023
- Merge branch 'js/ci-disable-cmake-by-default' into next
  gitster
  committed
  3f014ca
- Merge branch 'js/drop-mingw-test-cmp' into next
  gitster
  committed
  402866b
- Sync with 'master'
  gitster
  committed
  7cf837f
Commits on Jan 5, 2023
- Merge branch 'cw/ci-whitespace' into next
  gitster
  committed
  d3dc35f
- Sync with 'master'
  gitster
  committed
  2a6d74b
Commits on Jan 8, 2023
- Merge branch 'es/t1509-root-fixes' into next
  gitster
  committed
  c922e34
- Merge branch 'pw/ci-print-failure-name-fix' into next
  gitster
  committed
  8bb55c1
- Merge branch 'tb/ci-concurrency' into next
  gitster
  committed
  ab7cdc2
- Merge branch 'tr/am--no-verify' into next
  gitster
  committed
  4585013
- Merge branch 'ds/bundle-uri-4' into next
  gitster
  committed
  d5b03bd
- Merge branch 'jk/ext-diff-with-relative' into next
  gitster
  committed
  5233a7d
- Sync with 'master'
  gitster
  committed
  eba37e4
Commits on Jan 9, 2023
- Merge branch 'ws/single-file-cone' into next
  gitster
  committed
  b6d4d7b
- Merge branch 'ds/omit-trailing-hash-in-index' into next
  gitster
  committed
  e17ef56
- Merge branch 'ar/dup-words-fixes' into next
  gitster
  committed
  2a5d453
- Merge branch 'jk/strncmp-to-api-funcs' into next
  gitster
  committed
  47395b7
- Merge branch 'jk/read-object-cleanup' into next
  gitster
  committed
  19cc3de
Commits on Jan 13, 2023
- cache API: add a "INDEX_STATE_INIT" macro/function, add release_index()
  
  avar
  authored and
  gitster
  committed
  8c17794
- Merge branch 'jk/read-object-cleanup' into next
  gitster
  committed
  8cbeef4
Commits on Jan 14, 2023
- ci: do not die on deprecated-declarations warning
  gitster
  committed
  f87250d
Commits on Jan 15, 2023
- Merge branch 'jx/t1301-updates' into next
  gitster
  committed
  d4f081b
- Merge branch 'rs/dup-array' into next
  gitster
  committed
  3efbd1f
- Merge branch 'es/hooks-and-local-env' into next
  gitster
  committed
  93acd89
- Merge branch 'jc/doc-diff-patch.txt' into next
  gitster
  committed
  d25ec1f
- Merge branch 'ar/test-cleanup' into next
  gitster
  committed
  16d372b
- Merge branch 'ar/bisect-doc-update' into next
  gitster
  committed
  df51855
- Merge branch 'jk/interop-error' into next
  gitster
  committed
  ddca788
- Merge branch 'sk/merge-filtering-strategies-micro-optim' into next
  gitster
  committed
  f171559
- Merge branch 'yo/doc-use-more-switch-c' into next
  gitster
  committed
  7169d5d
- Merge branch 'pb/doc-orig-head' into next
  gitster
  committed
  0583c14
- Merge branch 'pw/rebase-exec-cleanup' into next
  gitster
  committed
  553d0da
- Merge branch 'ph/parse-date-reduced-precision' into next
  gitster
  committed
  eb83564
- Merge branch 'ab/cache-api-cleanup' into next
  gitster
  committed
  1019c16
- Merge branch 'tl/ls-tree-code-clean-up' into next
  gitster
  committed
  f723803
- Merge branch 'ab/bisect-cleanup' into next
  gitster
  committed
  945b631
- Merge branch 'yc/doc-fetch-fix' into next
  gitster
  committed
  a3ca608
- Merge branch 'jc/ci-deprecated-declarations-are-not-fatal' into next
  gitster
  committed
  5efb778
Commits on Jan 16, 2023
- Merge branch 'ab/cache-api-cleanup' into next
  gitster
  committed
  a0f388b
- Merge branch 'en/t6426-todo-cleanup' into next
  gitster
  committed
  7d13842
- Merge branch 'rs/ls-tree-path-expansion-fix' into next
  gitster
  committed
  6359f28
- Merge branch 'kn/attr-from-tree' into next
  gitster
  committed
  426f357
- Merge branch 'ab/test-env-helper' into next
  gitster
  committed
  82c17f0
- Merge branch 'rs/use-enhanced-bre-on-macos' into next
  gitster
  committed
  9b80d42
- Merge branch 'sk/win32-close-handle-upon-pthread-join' into next
  gitster
  committed
  faa279f
- Merge branch 'jc/format-patch-v-unleak' into next
  gitster
  committed
  2155d51
- Sync with 'master'
  gitster
  committed
  ba8063c
Commits on Jan 17, 2023
- Sync with 'master'
  gitster
  committed
  3abcab4
- Revert "Merge branch 'jc/ci-deprecated-declarations-are-not-fatal' into next"
  gitster
  committed
  7101908
- Merge branch 'jk/curl-avoid-deprecated-api' into next
  gitster
  committed
  e3ead5f
- Merge branch 'ds/omit-trailing-hash-in-index' into next
  gitster
  committed
  8dde3cf
- Merge branch 'zh/scalar-progress' into next
  gitster
  committed
  d4c25cc
Commits on Jan 18, 2023
- Merge branch 'ab/cache-api-cleanup-users' into next
  gitster
  committed
  c5a4374
- Merge branch 'sa/cat-file-mailmap--batch-check' into next
  gitster
  committed
  25ecb1d
Commits on Jan 19, 2023
- Merge branch 'cb/grep-pcre-ucp' into next
  gitster
  committed
  2c7e531
- Merge branch 'km/send-email-with-v-reroll-count' into next
  gitster
  committed
  9b35434
- Merge branch 'pb/branch-advice-recurse-submodules' into next
  gitster
  committed
  13747fc
- Merge branch 'jk/hash-object-literally-fd-leak' into next
  gitster
  committed
  fff9b60
- Merge branch 'jc/doc-branch-update-checked-out-branch' into next
  gitster
  committed
  970900a
Commits on Jan 20, 2023
- Sync with 'master'
  gitster
  committed
  5372860
- Merge branch 'cw/fetch-remote-group-with-duplication' into next
  gitster
  committed
  7f00e43
- Sync with 'master'
  gitster
  committed
  e598a9d
Commits on Jan 21, 2023
- daemon: libify socket setup and option functions
  
  mjcheetham
  authored and
  gitster
  committed
  695a4d8
- daemon: libify child process handling functions
  
  mjcheetham
  authored and
  gitster
  committed
  22eb100
- daemon: rename some esoteric/laboured terminology
  
  mjcheetham
  authored and
  gitster
  committed
  5b9dcd8
- test-http-server: add stub HTTP server test helper
  
  mjcheetham
  authored and
  gitster
  committed
  861812f
- test-http-server: add HTTP error response function
  
  mjcheetham
  authored and
  gitster
  committed
  784068d
- test-http-server: add HTTP request parsing
  
  mjcheetham
  authored and
  gitster
  committed
  de07f4d
- test-http-server: pass Git requests to http-backend
  
  mjcheetham
  authored and
  gitster
  committed
  d00b44e
- test-http-server: add simple authentication
  
  mjcheetham
  authored and
  gitster
  committed
  7739ad6
- test-http-server: add sending of arbitrary headers
  
  mjcheetham
  authored and
  gitster
  committed
  b19bbff
- http: replace unsafe size_t multiplication with st_mult
  
  mjcheetham
  authored and
  gitster
  committed
  33ac453
- http: read HTTP WWW-Authenticate response headers
  
  mjcheetham
  authored and
  gitster
  committed
  d3ffed2
- credential: add WWW-Authenticate header to cred requests
  
  mjcheetham
  authored and
  gitster
  committed
  026012c
Commits on Jan 22, 2023
- Sync with 'master'
  gitster
  committed
  fc5497d
- rebase: mark --update-refs as requiring the merge backend
  
  newren
  authored and
  gitster
  committed
  c27c14a
- rebase: flag --apply and --merge as incompatible
  
  newren
  authored and
  gitster
  committed
  07fd806
- rebase: remove --allow-empty-message from incompatible opts
  
  newren
  authored and
  gitster
  committed
  53eb2d8
- rebase: fix docs about incompatibilities with --root
  
  newren
  authored and
  gitster
  committed
  0663632
- rebase: add coverage of other incompatible options
  
  newren
  authored and
  gitster
  committed
  e960029
- rebase: clarify the OPT_CMDMODE incompatibilities
  
  newren
  authored and
  gitster
  committed
  73c876b
- rebase: fix formatting of rebase --reapply-cherry-picks option in docs
  
  newren
  authored and
  gitster
  committed
  0ea5f5c
- rebase: put rebase_options initialization in single place
  
  newren
  authored and
  gitster
  committed
  bbc56ef
- rebase: provide better error message for apply options vs. merge config
  
  newren
  authored and
  gitster
  committed
  e1caa25
Commits on Jan 23, 2023
- attr: fix instructions on how to check attrs
  
  john-cai
  authored and
  gitster
  committed
  13d6c61
- Merge branch 'jc/doc-checkout-b' into next
  gitster
  committed
  95340e1
- Merge branch 'po/pretty-format-columns-doc' into next
  gitster
  committed
  d41cb5f
- Merge branch 'jk/hash-object-fsck' into next
  gitster
  committed
  985e87f
- Merge branch 'tb/t0003-invoke-dd-more-portably' into next
  gitster
  committed
  917aa24
- Merge branch 'en/rebase-update-refs-needs-merge-backend' into next
  gitster
  committed
  1b65346
- Sync with 'master'
  gitster
  committed
  4fa01a4
Commits on Jan 24, 2023
- Merge branch 'jc/attr-doc-fix' into next
  gitster
  committed
  a25d37c
- Merge branch 'ar/markup-em-dash' into next
  gitster
  committed
  0367e30
Commits on Jan 25, 2023
Commits on Jan 26, 2023
- Revert "Merge branch 'jc/attr-doc-fix' into next"
  gitster
  committed
  4fc4bde
- Merge branch 'jc/attr-doc-fix' into next
  gitster
  committed
  cb327c4
Commits on Jan 27, 2023
- Merge branch 'en/rebase-incompatible-opts' into next
  gitster
  committed
  35a67cf
- Merge branch 'en/ls-files-doc-update' into next
  gitster
  committed
  20b9803
- Sync with 'master'
  gitster
  committed
  763fc19
Commits on Jan 30, 2023
- Merge branch 'gm/request-pull-with-non-pgp-signed-tags' into next
  gitster
  committed
  abc684d
- Merge branch 'mh/doc-credential-cache-only-in-core' into next
  gitster
  committed
  021b522
- Sync with 'master'
  gitster
  committed
  b5b5020
Commits on Jan 31, 2023
- Revert "Merge branch 'mc/credential-helper-auth-headers' into next"
  gitster
  committed
  d423119
- Merge branch 'ds/scalar-ignore-cron-error' into next
  gitster
  committed
  98d13ac
Commits on Feb 4, 2023
- Merge branch 'gc/index-format-doc' into next
  gitster
  committed
  b6d9957
- Merge branch 'jk/httpd-test-updates' into next
  gitster
  committed
  79c7df1
- Merge branch 'hj/remove-msys-support' into next
  gitster
  committed
  11f0f55
- Sync with 'master'
  gitster
  committed
  bd247dd
- Merge branch 'sk/winansi-createthread-fix' into next
  gitster
  committed
  88ce39d
- Merge branch 'ew/free-island-marks' into next
  gitster
  committed
  bfd4509
Commits on Feb 8, 2023
- Merge branch 'cb/grep-fallback-failing-jit' into next
  gitster
  committed
  3a70d6e
- Merge branch 'ds/bundle-uri-5' into next
  gitster
  committed
  1ba9ba5
- Sync with 'master'
  gitster
  committed
  a4c54d6
Commits on Feb 9, 2023
- Sync with 'master'
  gitster
  committed
  b2b6baf
Commits on Feb 10, 2023
- Merge branch 'ab/sequencer-unleak' into next
  gitster
  committed
  98bff19
- Merge branch 'po/attributes-text' into next
  gitster
  committed
  8be7b13
- Merge branch 'ar/userdiff-java-update' into next
  gitster
  committed
  f624973
- Merge branch 'wl/new-command-doc' into next
  gitster
  committed
  23bcd4d
- Merge branch 'kf/t5000-modernise' into next
  gitster
  committed
  0341c54
- Merge branch 'rs/size-t-fixes' into next
  gitster
  committed
  4bf6998
- Merge branch 'ab/retire-scripted-add-p' into next
  gitster
  committed
  1b8c7bc
- Merge branch 'ab/config-h-remove-unused' into next
  gitster
  committed
  fa83258
- Merge branch 'cw/doc-pushurl-vs-url' into next
  gitster
  committed
  21b0678
- Merge branch 'en/name-rev-make-taggerdate-much-less-important' into next
  gitster
  committed
  059bc95
Commits on Feb 13, 2023
- Merge branch 'ab/the-index-compatibility' into next
  gitster
  committed
  4f9869d
- Merge branch 'rs/cache-tree-strbuf-growth-fix' into next
  gitster
  committed
  fd9ae87
- Merge branch 'jk/doc-ls-remote-matching' into next
  gitster
  committed
  79a209b
Commits on Feb 14, 2023
- Merge branch 'ab/various-leak-fixes' into next
  gitster
  committed
  0cee974
- Merge branch 'ab/hook-api-with-stdin' into next
  gitster
  committed
  4cb74ec
- Sync with 'master'
  gitster
  committed
  0c349d5
- Sync with 'master'
  gitster
  committed
  61fb29f
Commits on Feb 15, 2023
- Merge branch 'rs/ctype-test' into next
  gitster
  committed
  279f198
Commits on Feb 16, 2023
- Merge branch 'js/gpg-errors' into next
  gitster
  committed
  510898f
- Sync with 'master'
  gitster
  committed
  9855ee2
Commits on Feb 22, 2023
- Merge branch 'rd/doc-default-date-format' into next
  gitster
  committed
  3818705
- Merge branch 'jc/genzeros-avoid-raw-write' into next
  gitster
  committed
  a60fe69
- Merge branch 'pw/rebase-i-validate-labels-early' into next
  gitster
  committed
  9b37d42
- Merge branch 'jc/diff-algo-attribute' into next
  gitster
  committed
  2375640
- Merge branch 'ap/t2015-style-update' into next
  gitster
  committed
  40883b8
- Merge branch 'ma/fetch-parallel-use-online-cpus' into next
  gitster
  committed
  756d379
- Merge branch 'tl/range-diff-custom-abbrev' into next
  gitster
  committed
  49db7cc
- Merge branch 'jk/http-proxy-tests' into next
  gitster
  committed
  f1f69d1
- Merge branch 'tb/drop-dir-iterator-follow-symlink-bit' into next
  gitster
  committed
  785e1f3
- Merge branch 'ps/free-island-marks' into next
  gitster
  committed
  f46938b
- Sync with 'master'
  gitster
  committed
  32e93fb
- branch: avoid unnecessary worktrees traversals
  
  rjusto
  authored and
  gitster
  committed
  c8fb01f
- branch: description for orphan branch errors
  
  rjusto
  authored and
  gitster
  committed
  bb07ee6
- branch: rename orphan branches in any worktree
  
  rjusto
  authored and
  gitster
  committed
  1b878ca
Commits on Feb 24, 2023
- Merge branch 'rs/archive-mtime' into next
  gitster
  committed
  3486969
- Merge branch 'mh/credential-password-expiry' into next
  gitster
  committed
  dbff7db
- Merge branch 'jk/shorten-unambiguous-ref-wo-sscanf' into next
  gitster
  committed
  12ca568
- Merge branch 'jc/countermand-format-attach' into next
  gitster
  committed
  709ed91
- Merge branch 'if/simplify-trace-setup' into next
  gitster
  committed
  9c8e690
- Sync with Git 2.40-rc0
  gitster
  committed
  c4246ad
Commits on Feb 25, 2023
- Merge branch 'jk/fsck-indices-in-worktrees' into next
  gitster
  committed
  38c0793
- Merge branch 'pw/rebase-i-parse-fix' into next
  gitster
  committed
  5a2a256
- Merge branch 'jk/http-test-fixes' into next
  gitster
  committed
  8f3d70a
- Sync with 'master'
  gitster
  committed
  a93b196
Commits on Feb 27, 2023
- Merge branch 'jk/fsck-indices-in-worktrees' into next
  gitster
  committed
  6eb92ab
- Merge branch 'en/dir-api-cleanup' into next
  gitster
  committed
  434ac6b
- Merge branch 'en/header-cleanup' into next
  gitster
  committed
  f4a3707
- Merge branch 'jk/unused-post-2.39-part2' into next
  gitster
  committed
  f0ec2a8
- Sync with 'master'
  gitster
  committed
  e43d3b9
- Merge branch 'jc/gpg-lazy-init' into next
  gitster
  committed
  e3f81cf
- Merge branch 'zy/t9700-style' into next
  gitster
  committed
  6c52b8e
- Merge branch 'ar/test-lib-remove-stale-comment' into next
  gitster
  committed
  d948667
- Merge branch 'mc/credential-helper-www-authenticate' into next
  gitster
  committed
  89c9bd4
Commits on Mar 1, 2023
- Merge branch 'rs/range-diff-custom-abbrev-fix' into next
  gitster
  committed
  82f1929
- Sync with 'master'
  gitster
  committed
  221deae
- Merge branch 'ew/fetch-hiderefs' into next
  gitster
  committed
  6a7eece
- Merge branch 'gm/signature-format-doc' into next
  gitster
  committed
  19f9ce8
- Merge branch 'fz/rebase-msg-update' into next
  gitster
  committed
  f28c0df
- Sync with Git 2.40-rc1
  gitster
  committed
  e12885d
- Sync with 'master'
  gitster
  committed
  88254d5
Commits on Mar 7, 2023
- Merge branch 'ab/avoid-losing-exit-codes-in-tests' into next
  gitster
  committed
  60d7d0d
- Merge branch 'ew/commit-reach-clean-up-flags-fix' into next
  gitster
  committed
  5dc1c4c
- Merge branch 'ak/restore-both-incompatible-with-conflicts' into next
  gitster
  committed
  4ee3418
- Merge branch 'zh/push-to-delete-onelevel-ref' into next
  gitster
  committed
  f08def5
- Merge branch 'rj/bisect-already-used-branch' into next
  gitster
  committed
  3508814
- Merge branch 'rj/branch-unborn-in-other-worktrees' into next
  gitster
  committed
  6ee0ec7
- Merge branch 'rj/avoid-switching-to-already-used-branch' into next
  gitster
  committed
  7546231
- Sync with Git 2.40-rc2
  gitster
  committed
  97d40d9
- Merge branch 'as/doc-markup-fix' into next
  gitster
  committed
  8c72896
- Merge branch 'jk/bundle-progress' into next
  gitster
  committed
  0df2b09
- Merge branch 'jk/bundle-use-dash-for-stdfiles' into next
  gitster
  committed
  8ceb58f
- Merge branch 'jk/format-patch-change-format-for-empty-commits' into next
  gitster
  committed
  1c421f4
Commits on Mar 8, 2023
- object-file: reprepare alternates when necessary
  
  derrickstolee
  authored and
  gitster
  committed
  057a59e
- Merge branch 'ds/reprepare-alternates-when-repreparing-packfiles' into next
  gitster
  committed
  390cd4f
- Merge branch 'ab/fix-strategy-opts-parsing' into next
  gitster
  committed
  bd9eff2
- Merge branch 'fc/advice-diverged-history' into next
  gitster
  committed
  30e7016
Commits on Mar 9, 2023
Commits on Mar 12, 2023
- Merge branch 'jk/format-patch-ignore-noprefix' into next
  gitster
  committed
  621d71c
- Sync with Git 2.40
  gitster
  committed
  60544f8
Commits on Mar 13, 2023
- Merge branch 'jk/format-patch-ignore-noprefix' into next
  gitster
  committed
  4b28e38
- Merge branch 'aj/ls-files-format-fix' into next
  gitster
  committed
  27f876a
- Merge branch 'ps/receive-pack-unlock-before-die' into next
  gitster
  committed
  8d099df
- Merge branch 'fc/test-aggregation-clean-up' into next
  gitster
  committed
  f938b09
Commits on Mar 14, 2023
- rebase -i --rebase-merges: offer a smart way to rebase merge commits
  dscho
  committed
  bacd0b4
- WIP rebase --rebase-merges: give rerere a chance
  dscho
  committed
  f478f29
- t3430: add some realistic tests for --rebase-merges
  dscho
  committed
  6dd019c
- WIP rebase --rebase-merges: try to avoid unnecessary merge conflicts
  dscho
  committed
  f906277

Commits

Commits on Dec 16, 2022

Commits on Dec 19, 2022

Commits on Dec 20, 2022

Commits on Dec 26, 2022

Commits on Dec 28, 2022

Commits on Jan 2, 2023

Commits on Jan 5, 2023

Commits on Jan 8, 2023

Commits on Jan 9, 2023

Commits on Jan 13, 2023

Commits on Jan 14, 2023

Commits on Jan 15, 2023

Commits on Jan 16, 2023

Commits on Jan 17, 2023

Commits on Jan 18, 2023

Commits on Jan 19, 2023

Commits on Jan 20, 2023

Commits on Jan 21, 2023

Commits on Jan 22, 2023