summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2018-07-24Merge branch 'jk/empty-pick-fix'Libravatar Junio C Hamano1-4/+8
2018-07-24Merge branch 'bb/pedantic'Libravatar Junio C Hamano1-2/+2
2018-07-18Merge branch 'en/rebase-i-microfixes'Libravatar Junio C Hamano1-1/+6
2018-07-18Merge branch 'pw/rebase-i-keep-reword-after-conflict'Libravatar Junio C Hamano1-3/+20
2018-07-18Merge branch 'sb/object-store-grafts'Libravatar Junio C Hamano1-25/+27
2018-07-11sequencer: don't say BUG on bogus inputLibravatar Jeff King1-2/+4
2018-07-11sequencer: handle empty-set cases consistentlyLibravatar Jeff King1-2/+4
2018-07-09sequencer.c: avoid empty statements at top levelLibravatar Beat Bolli1-2/+2
2018-06-27Fix use of strategy options with interactive rebasesLibravatar Elijah Newren1-1/+6
2018-06-25Merge branch 'sb/plug-misc-leaks'Libravatar Junio C Hamano1-1/+3
2018-06-25Merge branch 'nd/commit-util-to-slab'Libravatar Junio C Hamano1-6/+18
2018-06-25sequencer.c: plug mem leak in git_sequencer_configLibravatar Stefan Beller1-0/+1
2018-06-19sequencer: do not squash 'reword' commits when we hit conflictsLibravatar Phillip Wood1-3/+20
2018-06-18Merge branch 'js/rebase-i-root-fix'Libravatar Junio C Hamano1-1/+1
2018-06-18rebase --root: fix amending root commit messagesLibravatar Johannes Schindelin1-1/+1
2018-06-04sequencer.c: plug leaks in do_pick_commitLibravatar Stefan Beller1-1/+2
2018-06-01Merge branch 'js/rebase-recreate-merge'Libravatar Junio C Hamano1-1/+1
2018-06-01Merge branch 'nd/command-list'Libravatar Junio C Hamano1-0/+1
2018-05-30Merge branch 'bc/object-id'Libravatar Junio C Hamano1-2/+2
2018-05-30Merge branch 'js/sequencer-and-root-commits'Libravatar Junio C Hamano1-25/+181
2018-05-30sequencer: ensure labels that are object IDs are rewrittenLibravatar brian m. carlson1-1/+1
2018-05-23Merge branch 'js/rebase-recreate-merge'Libravatar Junio C Hamano1-37/+855
2018-05-23Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'Libravatar Junio C Hamano1-47/+146
2018-05-23Merge branch 'sb/oid-object-info'Libravatar Junio C Hamano1-1/+2
2018-05-23Merge branch 'ds/lazy-load-trees'Libravatar Junio C Hamano1-6/+6
2018-05-21sequencer.c: use commit-slab to associate todo items to commitsLibravatar Nguyễn Thái Ngọc Duy1-3/+9
2018-05-21sequencer.c: use commit-slab to mark seen commitsLibravatar Nguyễn Thái Ngọc Duy1-3/+9
2018-05-21Move declaration for alias.c to alias.hLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2018-05-18path.c: migrate global git_path_* to take a repository argumentLibravatar Stefan Beller1-18/+19
2018-05-16object-store: move object access functions to object-store.hLibravatar Stefan Beller1-0/+1
2018-05-08Merge branch 'js/ident-date-fix'Libravatar Junio C Hamano1-0/+2
2018-05-06rebase --rebase-merges: root commits can be cousins, tooLibravatar Johannes Schindelin1-1/+2
2018-05-06sequencer: learn about the special "fake root commit" handlingLibravatar Johannes Schindelin1-3/+121
2018-05-06rebase --rebase-merges: a "merge" into a new root is a fast-forwardLibravatar Johannes Schindelin1-0/+12
2018-05-06sequencer: allow introducing new root commitsLibravatar Johannes Schindelin1-12/+28
2018-05-06sequencer: extract helper to update active_cache_treeLibravatar Johannes Schindelin1-9/+18
2018-05-02sequencer: use the_hash_algo for empty tree object IDLibravatar brian m. carlson1-1/+1
2018-05-02sequencer: convert one use of EMPTY_TREE_SHA1_HEXLibravatar brian m. carlson1-1/+1
2018-05-02rebase --skip: clean up commit message after a failed fixup/squashLibravatar Johannes Schindelin1-13/+100
2018-05-02sequencer: always commit without editing when asked forLibravatar Johannes Schindelin1-0/+2
2018-05-02rebase -i: Handle "combination of <n> commits" with GETTEXT_POISONLibravatar Johannes Schindelin1-34/+44
2018-04-26rebase -i: introduce --rebase-merges=[no-]rebase-cousinsLibravatar Johannes Schindelin1-0/+4
2018-04-26rebase --rebase-merges: avoid "empty merges"Libravatar Johannes Schindelin1-0/+7
2018-04-26sequencer: handle post-rewrite for merge commandsLibravatar Johannes Schindelin1-1/+4
2018-04-26rebase-helper --make-script: introduce a flag to rebase mergesLibravatar Johannes Schindelin1-1/+345
2018-04-26sequencer: fast-forward `merge` commands, if possibleLibravatar Johannes Schindelin1-1/+32
2018-04-26sequencer: introduce the `merge` commandLibravatar Johannes Schindelin1-0/+200
2018-04-26sequencer: introduce new commands to reset the revisionLibravatar Johannes Schindelin1-7/+206
2018-04-26sequencer: offer helpful advice when a command was rescheduledLibravatar Johannes Schindelin1-0/+16
2018-04-26sequencer: refactor how original todo list lines are accessedLibravatar Johannes Schindelin1-24/+36
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 11:37:15 +0000