summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
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
2018-04-26sequencer: make rearrange_squash() a bit more obviousLibravatar Johannes Schindelin1-1/+1
2018-04-26sequencer: avoid using errno clobbered by rollback_lock_file()Libravatar Johannes Schindelin1-4/+6
2018-04-26cache.h: add repository argument to oid_object_infoLibravatar Stefan Beller1-1/+2
2018-04-25Merge branch 'sb/filenames-with-dashes'Libravatar Junio C Hamano1-1/+1
2018-04-25Merge branch 'pw/rebase-signoff'Libravatar Junio C Hamano1-1/+7
2018-04-25Merge branch 'pw/rebase-keep-empty-fixes'Libravatar Junio C Hamano1-2/+6
2018-04-19sequencer: reset the committer date before commitsLibravatar Johannes Sixt1-0/+2
2018-04-11exec_cmd: rename to use dash in file nameLibravatar Stefan Beller1-1/+1
2018-04-11treewide: replace maybe_tree with accessor methodsLibravatar Derrick Stolee1-6/+6
2018-04-11treewide: rename tree to maybe_treeLibravatar Derrick Stolee1-6/+6
2018-04-11Merge branch 'bw/c-plus-plus' into ds/lazy-load-treesLibravatar Junio C Hamano1-1/+1
2018-04-10Merge branch 'bc/object-id'Libravatar Junio C Hamano1-4/+5
2018-03-29rebase: extend --signoff supportLibravatar Phillip Wood1-1/+7
2018-03-29Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoffLibravatar Junio C Hamano1-2/+6
2018-03-29rebase -i --keep-empty: don't prune empty commitsLibravatar Phillip Wood1-2/+6
2018-03-21Merge branch 'ma/skip-writing-unchanged-index'Libravatar Junio C Hamano1-6/+5
2018-03-14Merge branch 'ma/roll-back-lockfiles'Libravatar Junio C Hamano1-18/+14
2018-03-14sha1_file: convert sha1_object_info* to object_idLibravatar brian m. carlson1-1/+2
2018-03-14Convert find_unique_abbrev* to struct object_idLibravatar brian m. carlson1-1/+1
2018-03-14cache-tree: convert write_*_as_tree to object_idLibravatar brian m. carlson1-2/+2
2018-03-06Merge branch 'bw/c-plus-plus'Libravatar Junio C Hamano1-1/+1
2018-03-06Merge branch 'rs/strbuf-read-file-or-whine'Libravatar Junio C Hamano1-46/+28
2018-03-06Merge branch 'nd/rebase-show-current-patch'Libravatar Junio C Hamano1-0/+4
2018-03-01write_locked_index(): add flag to avoid writing unchanged indexLibravatar Martin Ågren1-6/+5
2018-02-28sequencer: do not roll back lockfile unnecessarilyLibravatar Martin Ågren1-12/+6
2018-02-27sequencer: always roll back lock in `do_recursive_merge()`Libravatar Martin Ågren1-1/+3
2018-02-27sequencer: make lockfiles non-staticLibravatar Martin Ågren1-5/+5
2018-02-22sequencer: factor out strbuf_read_file_or_whine()Libravatar René Scharfe1-46/+28
2018-02-15Merge branch 'po/object-id'Libravatar Junio C Hamano1-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 20:03:03 +0000