aboutsummaryrefslogtreecommitdiffstats
path: root/sequencer.h
AgeCommit message (Expand)AuthorFilesLines
2024-02-27rebase -i: stop setting GIT_CHERRY_PICK_HELPPhillip Wood1-0/+2
2024-01-19sequencer: introduce functions to handle autostashes via refsPatrick Steinhardt1-0/+3
2023-04-10rebase -m: cleanup --strategy-option handlingPhillip Wood1-1/+0
2023-04-10sequencer: use struct strvec to store merge strategy optionsPhillip Wood1-3/+8
2023-02-23treewide: remove unnecessary cache.h includesElijah Newren1-1/+1
2023-02-06sequencer API users: fix get_replay_opts() leaksÆvar Arnfjörð Bjarmason1-0/+1
2022-11-09sequencer: stop exporting GIT_REFLOG_ACTIONPhillip Wood1-0/+6
2022-07-19sequencer: rewrite update-refs as user edits todo listDerrick Stolee1-0/+12
2022-07-19rebase: add --update-refs optionDerrick Stolee1-0/+1
2022-07-19sequencer: add update-ref commandDerrick Stolee1-0/+1
2022-07-19branch: consider refs under 'update-refs'Derrick Stolee1-0/+9
2022-05-26revert: optionally refer to commit in the "reference" formatJunio C Hamano1-0/+1
2022-01-26create_autostash(): remove unneeded parameterPhillip Wood1-2/+1
2021-10-18Merge branch 'js/retire-preserve-merges'Junio C Hamano1-2/+0
2021-10-11Merge branch 'ab/designated-initializers'Junio C Hamano1-1/+3
2021-10-06Merge branch 'pw/rebase-reread-todo-after-editing'Junio C Hamano1-1/+0
2021-09-27*.h: move some *_INIT to designated initializersÆvar Arnfjörð Bjarmason1-1/+3
2021-09-24rebase: fix todo-list rereadingPhillip Wood1-1/+0
2021-09-07sequencer: restrict scope of a formerly public functionJohannes Schindelin1-2/+0
2021-08-30sequencer: advise if skipping cherry-picked commitJosh Steadmon1-0/+1
2021-03-31sequencer: fix edit handling for cherry-pick and revert messagesElijah Newren1-2/+4
2020-11-18Merge branch 'en/merge-ort-api-null-impl'Junio C Hamano1-0/+1
2020-11-18Merge branch 'pw/rebase-i-orig-head'Junio C Hamano1-3/+4
2020-11-09Merge branch 'jk/committer-date-is-author-date-fix-simplify'Junio C Hamano1-2/+0
2020-11-04rebase -i: use struct object_id when writing statePhillip Wood1-1/+1
2020-11-04rebase -i: use struct object_id rather than looking up commitPhillip Wood1-2/+3
2020-11-02merge,rebase,revert: select ort or recursive by config or environmentElijah Newren1-0/+1
2020-10-26am, sequencer: stop parsing our own committer identJeff King1-2/+0
2020-09-03Merge branch 'pw/rebase-i-more-options'Junio C Hamano1-0/+4
2020-08-19rebase -i: support --ignore-datePhillip Wood1-0/+1
2020-08-17rebase -i: support --committer-date-is-author-datePhillip Wood1-0/+3
2020-04-29Merge branch 'dl/merge-autostash'Junio C Hamano1-0/+20
2020-04-22Merge branch 'jt/rebase-allow-duplicate'Junio C Hamano1-1/+1
2020-04-22Merge branch 'en/rebase-no-keep-empty'Junio C Hamano1-1/+1
2020-04-11rebase --merge: optionally skip upstreamed commitsJonathan Tan1-1/+1
2020-04-11rebase: reinstate --no-keep-emptyElijah Newren1-1/+1
2020-04-10sequencer: implement apply_autostash_oid()Denton Liu1-0/+1
2020-04-10sequencer: implement save_autostash()Denton Liu1-0/+1
2020-04-10sequencer: extract perform_autostash() from rebaseDenton Liu1-0/+2
2020-04-10rebase: use apply_autostash() from sequencer.cDenton Liu1-0/+2
2020-04-07sequencer: make read_oneliner() externDenton Liu1-0/+14
2020-03-25Merge branch 'pw/advise-rebase-skip'Junio C Hamano1-1/+2
2020-03-02Merge branch 'en/rebase-backend'Junio C Hamano1-1/+2
2020-02-16rebase (interactive-backend): fix handling of commits that become emptyElijah Newren1-0/+1
2020-02-16rebase (interactive-backend): make --keep-empty the defaultElijah Newren1-1/+1
2020-02-14Merge branch 'ag/edit-todo-drop-check'Junio C Hamano1-1/+1
2020-02-14Merge branch 'ag/rebase-avoid-unneeded-checkout'Junio C Hamano1-3/+0
2020-01-28rebase-interactive: warn if commit is dropped with `rebase --edit-todo'Alban Gruin1-0/+1
2020-01-28sequencer: move check_todo_list_from_file() to rebase-interactive.cAlban Gruin1-1/+0
2020-01-24rebase -i: stop checking out the tip of the branch to rebaseAlban Gruin1-3/+0
2020-01-12Revert "Merge branch 'ra/rebase-i-more-options'"Junio C Hamano1-2/+0
2019-12-10Merge branch 'ra/rebase-i-more-options'Junio C Hamano1-0/+2
2019-12-06commit: encapsulate determine_whence() for sequencerPhillip Wood1-1/+2
2019-11-10Merge branch 'pw/post-commit-from-sequencer'Junio C Hamano1-2/+1
2019-11-02rebase -i: support --ignore-dateRohit Ashiwal1-0/+1
2019-11-02rebase -i: support --committer-date-is-author-dateRohit Ashiwal1-0/+1
2019-10-16sequencer.h fix placement of #endifPhillip Wood1-2/+1
2019-09-18Merge branch 'js/rebase-r-strategy'Junio C Hamano1-0/+6
2019-07-31rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`Johannes Schindelin1-0/+6
2019-07-19Merge branch 'ra/cherry-pick-revert-skip'Junio C Hamano1-0/+1
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano1-1/+1
2019-07-02cherry-pick/revert: add --skip optionRohit Ashiwal1-0/+1
2019-05-13Merge branch 'pw/clean-sequencer-state-upon-final-commit'Junio C Hamano1-0/+3
2019-05-13Merge branch 'pw/rebase-i-internal'Junio C Hamano1-3/+4
2019-05-09Merge branch 'dl/merge-cleanup-scissors-fix'Junio C Hamano1-1/+8
2019-05-09Merge branch 'pw/sequencer-cleanup-with-signoff-x-fix'Junio C Hamano1-0/+1
2019-04-25Merge branch 'ag/sequencer-reduce-rewriting-todo'Junio C Hamano1-17/+64
2019-04-19rebase -i: use struct commit when parsing optionsPhillip Wood1-2/+2
2019-04-19sequencer: always discard index after checkoutPhillip Wood1-1/+2
2019-04-19Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internalJunio C Hamano1-17/+64
2019-04-19cherry-pick/revert: add scissors line on merge conflictDenton Liu1-1/+2
2019-04-18commit: extract cleanup_mode functions to sequencerDenton Liu1-0/+6
2019-04-18sequencer: fix cleanup with --signoff and -xPhillip Wood1-0/+1
2019-04-17fix cherry-pick/revert status after commitPhillip Wood1-0/+2
2019-04-17commit/reset: try to clean up sequencer statePhillip Wood1-0/+1
2019-03-07rebase--interactive: move transform_todo_file()Alban Gruin1-1/+0
2019-03-07rebase-interactive: rewrite edit_todo_list() to handle the initial editAlban Gruin1-0/+1
2019-03-07rebase-interactive: use todo_list_write_to_file() in edit_todo_list()Alban Gruin1-3/+0
2019-03-07rebase--interactive: move rearrange_squash_in_todo_file()Alban Gruin1-1/+1
2019-03-07rebase--interactive: move sequencer_add_exec_commands()Alban Gruin1-2/+2
2019-03-07sequencer: change complete_action() to use the refactored functionsAlban Gruin1-1/+1
2019-03-07sequencer: make sequencer_make_script() write its script to a strbufAlban Gruin1-3/+2
2019-03-07sequencer: refactor rearrange_squash() to work on a todo_listAlban Gruin1-1/+1
2019-03-07sequencer: refactor sequencer_add_exec_commands() to work on a todo_listAlban Gruin1-2/+3
2019-02-13Merge branch 'rj/sequencer-sign-off-header-static'Junio C Hamano1-2/+0
2019-02-11sequencer: make sign_off_header a file local symbolRamsay Jones1-2/+0
2019-02-06Merge branch 'nd/the-index-final'Junio C Hamano1-1/+2
2019-02-06Merge branch 'en/rebase-merge-on-sequencer'Junio C Hamano1-0/+1
2019-01-29Merge branch 'js/rebase-i-redo-exec'Junio C Hamano1-0/+1
2019-01-29sequencer: refactor check_todo_list() to work on a todo_listAlban Gruin1-8/+1
2019-01-29sequencer: introduce todo_list_write_to_file()Alban Gruin1-4/+7
2019-01-29sequencer: refactor transform_todos() to work on a todo_listAlban Gruin1-1/+3
2019-01-29sequencer: remove the 'arg' field from todo_itemAlban Gruin1-2/+4
2019-01-14notes-utils.c: remove the_repository referencesNguyễn Thái Ngọc Duy1-1/+2
2019-01-08sequencer: make the todo_list structure publicAlban Gruin1-0/+50
2019-01-04Merge branch 'nd/the-index'Junio C Hamano1-11/+16
2018-12-28git-rebase, sequencer: extend --quiet option for the interactive machineryElijah Newren1-0/+1
2018-12-11rebase: introduce --reschedule-failed-execJohannes Schindelin1-0/+1
2018-11-13Merge branch 'pw/am-rebase-read-author-script'Junio C Hamano1-0/+3
2018-11-12sequencer.c: remove implicit dependency on the_repositoryNguyễn Thái Ngọc Duy1-6/+6
2018-11-12sequencer.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-5/+10
2018-11-02Merge branch 'ag/rebase-i-in-c'Junio C Hamano1-1/+21
2018-11-01add read_author_script() to libgitPhillip Wood1-0/+3
2018-09-17Merge branch 'jk/trailer-fixes'Junio C Hamano1-1/+8
2018-08-29rebase -i: rewrite write_basic_state() in CAlban Gruin1-0/+4
2018-08-29rebase -i: remove unused modes and functionsAlban Gruin1-4/+0
2018-08-29rebase -i: rewrite complete_action() in CAlban Gruin1-0/+4
2018-08-23append_signoff: use size_t for string offsetsJeff King1-1/+8
2018-08-15Add missing includes and forward declarationsElijah Newren1-0/+5
2018-08-10sequencer: change the way skip_unnecessary_picks() returns its resultAlban Gruin1-1/+1
2018-08-10rebase -i: rewrite checkout_onto() in CAlban Gruin1-0/+3
2018-08-10rebase -i: rewrite setup_reflog_action() in CAlban Gruin1-0/+2
2018-08-10sequencer: make three functions and an enum from sequencer.c publicAlban Gruin1-0/+11
2018-05-30Merge branch 'js/sequencer-and-root-commits'Junio C Hamano1-0/+4
2018-05-23Merge branch 'js/rebase-recreate-merge'Junio C Hamano1-0/+7
2018-05-06sequencer: learn about the special "fake root commit" handlingJohannes Schindelin1-0/+4
2018-05-02rebase -i: Handle "combination of <n> commits" with GETTEXT_POISONJohannes Schindelin1-1/+5
2018-04-26rebase -i: introduce --rebase-merges=[no-]rebase-cousinsJohannes Schindelin1-0/+6
2018-04-26rebase-helper --make-script: introduce a flag to rebase mergesJohannes Schindelin1-0/+1
2018-02-13Merge branch 'pw/sequencer-in-process-commit'Junio C Hamano1-0/+25
2018-01-24sequencer: run 'prepare-commit-msg' hookPhillip Wood1-0/+1
2017-12-13sequencer: improve config handlingPhillip Wood1-9/+10
2017-12-05rebase -i: learn to abbreviate command namesLiam Beguin1-0/+1
2017-12-05rebase -i -x: add exec commands via the rebase--helperLiam Beguin1-0/+1
2017-12-05rebase -i: update functions to use a flags parameterLiam Beguin1-3/+5
2017-12-05rebase -i: refactor transform_todo_idsLiam Beguin1-1/+1
2017-11-24sequencer: load commit related configPhillip Wood1-0/+1
2017-11-24commit: move print_commit_summary() to libgitPhillip Wood1-0/+5
2017-11-18commit: move post-rewrite code to libgitPhillip Wood1-0/+2
2017-11-18Add a function to update HEAD after creating a commitPhillip Wood1-0/+4
2017-11-11commit: move empty message checks to libgitPhillip Wood1-0/+11
2017-07-27rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin1-0/+1
2017-07-27rebase -i: skip unnecessary picks using the rebase--helperJohannes Schindelin1-0/+1
2017-07-27rebase -i: check for missing commits in the rebase--helperJohannes Schindelin1-0/+1
2017-07-27rebase -i: also expand/collapse the SHA-1s via the rebase--helperJohannes Schindelin1-0/+2
2017-07-27rebase -i: generate the script via rebase--helperJohannes Schindelin1-0/+3
2017-01-09sequencer (rebase -i): learn about the 'verbose' modeJohannes Schindelin1-0/+1
2017-01-09sequencer: support a new action: 'interactive rebase'Johannes Schindelin1-1/+2
2016-10-21sequencer: get rid of the subcommand fieldJohannes Schindelin1-9/+4
2016-10-21sequencer: plug memory leaks for the option valuesJohannes Schindelin1-3/+3
2016-10-17sequencer: use memoized sequencer directory pathJohannes Schindelin1-4/+1
2016-10-17sequencer: use static initializers for replay_optsJohannes Schindelin1-0/+1
2014-11-10Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano1-0/+1
2014-10-24merge & sequencer: unify codepaths that write "Conflicts:" hintJunio C Hamano1-0/+1
2014-01-27cherry-pick, revert: add the --gpg-sign optionNicolas Vigier1-0/+2
2013-02-12sequencer.c: teach append_signoff how to detect duplicate s-o-bBrandon Casey1-1/+3
2012-09-18Merge branch 'jc/make-static'Junio C Hamano1-3/+0
2012-09-15sequencer.c: mark a private file-scope symbol as staticJunio C Hamano1-3/+0
2012-09-14cherry-pick: don't forget -s on failureMiklos Vajna1-0/+4
2012-08-06cherry-pick: add --allow-empty-message optionChris Webb1-0/+1
2012-04-24git-cherry-pick: Add keep-redundant-commits optionNeil Horman1-0/+1
2012-04-11git-cherry-pick: add allow-empty optionNeil Horman1-0/+1
2012-01-11sequencer: factor code out of revert builtinRamkumar Ramachandra1-0/+37
2011-12-12revert: stop creating and removing sequencer-old directoryJonathan Nieder1-10/+2
2011-11-22revert: rename --reset option to --quitJonathan Nieder1-1/+1
2011-08-04revert: Introduce --reset to remove sequencer stateRamkumar Ramachandra1-0/+20
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 09:13:40 +0000