diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-06-08 14:27:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-08 14:27:52 -0700 |
| commit | 363d54ff806097ee01ad0614dda950d0ca88987c (patch) | |
| tree | 2b077c184f3c80b7afa44cad7cdea25f887c320a /combine-diff.c | |
| parent | Merge branch 'pw/test-malloc-with-sanitize-address' into maint (diff) | |
| parent | rebase: use correct base for --keep-base when a branch is given (diff) | |
| download | git-363d54ff806097ee01ad0614dda950d0ca88987c.tar.gz git-363d54ff806097ee01ad0614dda950d0ca88987c.zip | |
Merge branch 'ah/rebase-keep-base-fix' into maint
"git rebase --keep-base <upstream> <branch-to-rebase>" computed the
commit to rebase onto incorrectly, which has been corrected.
source: <20220421044233.894255-1-alexhenrie24@gmail.com>
* ah/rebase-keep-base-fix:
rebase: use correct base for --keep-base when a branch is given
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions