summaryrefslogtreecommitdiffstats
path: root/builtin/rebase.c (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | rebase: use our standard error return valuePhillip Wood2021-09-221-9/+9
* | | Merge branch 'js/run-command-close-packs'Junio C Hamano2021-09-211-1/+0
|\ \ \
| * | | run_auto_maintenance(): implicitly close the object storeJohannes Schindelin2021-09-091-1/+0
| | |/ | |/|
* | | Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano2021-09-211-0/+6
|\ \ \ | |_|/ |/| |
| * | sparse-index: integrate with cherry-pick and rebaseDerrick Stolee2021-09-101-0/+6
| |/
* | Merge branch 'js/advise-when-skipping-cherry-picked'Junio C Hamano2021-09-101-0/+1
|\ \
| * | sequencer: advise if skipping cherry-picked commitJosh Steadmon2021-08-311-0/+1
| |/
* | Merge branch 'ab/rebase-fatal-fatal-fix'Junio C Hamano2021-09-081-1/+1
|\ \
| * | rebase: emit one "fatal" in "fatal: fatal: <error>"Ævar Arnfjörð Bjarmason2021-08-241-1/+1
* | | Merge branch 'en/ort-becomes-the-default'Junio C Hamano2021-08-311-1/+1
|\ \ \ | |_|/ |/| |
| * | Change default merge backend from recursive to ortElijah Newren2021-08-061-1/+1
| |/
* / builtin/rebase: fix options.strategy memory lifecycleAndrzej Hunt2021-07-261-1/+2
|/
* Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano2021-05-101-2/+2
|\
| * hash: provide per-algorithm null OIDsbrian m. carlson2021-04-271-2/+2
* | Merge branch 'ah/plugleaks'Junio C Hamano2021-05-071-0/+1
|\ \
| * | builtin/rebase: release git_format_patch_opt tooAndrzej Hunt2021-04-281-0/+1
* | | Merge branch 'en/ort-readiness'Junio C Hamano2021-04-161-0/+1
|\ \ \ | |_|/ |/| |
| * | merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren2021-03-201-0/+1
* | | rebase: remove transitory rebase.useBuiltin setting & envÆvar Arnfjörð Bjarmason2021-03-231-11/+0
| |/ |/|
* | rebase: add a config option for --no-fork-pointAlex Henrie2021-02-241-7/+13
|/
* Merge branch 'rs/rebase-commit-validation'Junio C Hamano2021-01-161-1/+3
|\
| * rebase: verify commit parameterRené Scharfe2021-01-051-1/+3
* | Merge branch 'en/merge-ort-api-null-impl'Junio C Hamano2020-11-181-1/+12
|\ \
| * | merge,rebase,revert: select ort or recursive by config or environmentElijah Newren2020-11-031-1/+12
| |/
* | Merge branch 'pw/rebase-i-orig-head'Junio C Hamano2020-11-181-10/+10
|\ \
| * | rebase -i: simplify get_revision_ranges()Phillip Wood2020-11-041-6/+4
| * | rebase -i: use struct object_id when writing statePhillip Wood2020-11-041-2/+3
| * | rebase -i: use struct object_id rather than looking up commitPhillip Wood2020-11-041-2/+3
| * | rebase -i: stop overwriting ORIG_HEAD bufferPhillip Wood2020-11-041-5/+5
| |/
* / Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn2020-10-201-1/+1
|/
* Merge branch 'ds/maintenance-part-1'Junio C Hamano2020-09-261-2/+2
|\
| * maintenance: replace run_auto_gc()Derrick Stolee2020-09-171-2/+2
* | Merge branch 'pw/rebase-i-more-options'Junio C Hamano2020-09-031-11/+36
|\ \ | |/ |/|
| * rebase: add --reset-author-dateRohit Ashiwal2020-08-201-1/+3
| * rebase -i: support --ignore-datePhillip Wood2020-08-201-5/+8
| * rebase -i: support --committer-date-is-author-datePhillip Wood2020-08-171-5/+12
| * rebase -i: add --ignore-whitespace flagRohit Ashiwal2020-07-131-3/+16
* | strvec: rename struct fieldsJeff King2020-07-311-8/+8
* | strvec: fix indentation in renamed callsJeff King2020-07-291-7/+7
* | strvec: convert builtin/ callers away from argv_array nameJeff King2020-07-291-30/+30
* | strvec: rename files from argv-array to strvecJeff King2020-07-291-1/+1
* | Merge branch 'jc/auto-gc-quiet'Junio C Hamano2020-05-131-2/+1
|\ \
| * | auto-gc: pass --quiet down from am, commit, merge and rebaseJunio C Hamano2020-05-071-2/+1
* | | Merge branch 'dl/opt-callback-cleanup'Junio C Hamano2020-05-051-10/+10
|\ \ \
| * | | Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu2020-04-281-10/+10
* | | | Merge branch 'en/rebase-root-and-fork-point-are-incompatible'Junio C Hamano2020-05-011-0/+3
|\ \ \ \
| * | | | rebase: display an error if --root and --fork-point are both providedElijah Newren2020-04-271-0/+3
| | |/ / | |/| |
* | | | Merge branch 'dl/merge-autostash-rebase-quit-fix'Junio C Hamano2020-04-301-0/+1
|\ \ \ \
| * | | | rebase: save autostash entry into stash reflog on --quitDenton Liu2020-04-281-0/+1
* | | | | Merge branch 'dl/merge-autostash'Junio C Hamano2020-04-301-264/+44
|\| | | | | |_|/ / |/| | |