summaryrefslogtreecommitdiffstats
path: root/builtin/rebase.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|\| | | | | |_|/ / |/| | |
| * | | merge: teach --autostash optionDenton Liu2020-04-101-2/+1
| * | | sequencer: extract perform_autostash() from rebaseDenton Liu2020-04-101-49/+0
| * | | rebase: generify create_autostash()Denton Liu2020-04-101-16/+16
| * | | rebase: extract create_autostash()Denton Liu2020-04-101-44/+50
| * | | reset: extract reset_head() from rebaseDenton Liu2020-04-101-138/+1
| * | | rebase: generify reset_head()Denton Liu2020-04-101-27/+37
| * | | rebase: use apply_autostash() from sequencer.cDenton Liu2020-04-101-47/+2
| * | | rebase: use read_oneliner()Denton Liu2020-04-101-20/+17
| |/ /
* | | Merge branch 'jt/rebase-allow-duplicate'Junio C Hamano2020-04-221-0/+7
|\ \ \
| * | | rebase --merge: optionally skip upstreamed commitsJonathan Tan2020-04-111-0/+7
* | | | Merge branch 'en/rebase-no-keep-empty'Junio C Hamano2020-04-221-7/+10
|\| | |
| * | | rebase: fix an incompatible-options error messageElijah Newren2020-04-111-1/+1
| * | | rebase: reinstate --no-keep-emptyElijah Newren2020-04-111-6/+9
| |/ /
* | | Merge branch 'dd/no-gpg-sign'Junio C Hamano2020-04-221-3/+4
|\ \ \ | |_|/ |/| |
| * | rebase.c: honour --no-gpg-signĐoàn Trần Công Danh2020-04-031-3/+4
| |/
* | Merge branch 'bc/filter-process'Junio C Hamano2020-03-271-0/+1
|\ \ | |/ |/|
| * builtin/rebase: compute checkout metadata for rebasesbrian m. carlson2020-03-161-0/+1
* | 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 '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 'es/do-not-let-rebase-switch-to-protected-branch'Junio C Hamano2020-03-051-2/+3
|\ \ \