summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)Author
2018-06-18Merge branch 'js/rebase-i-root-fix'Junio C Hamano
2018-06-18rebase --root: fix amending root commit messagesJohannes Schindelin
2018-06-01Merge branch 'js/rebase-recreate-merge'Junio C Hamano
2018-06-01Merge branch 'nd/command-list'Junio C Hamano
2018-05-30Merge branch 'bc/object-id'Junio C Hamano
2018-05-30Merge branch 'js/sequencer-and-root-commits'Junio C Hamano
2018-05-30sequencer: ensure labels that are object IDs are rewrittenbrian m. carlson
2018-05-23Merge branch 'js/rebase-recreate-merge'Junio C Hamano
2018-05-23Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'Junio C Hamano
2018-05-23Merge branch 'sb/oid-object-info'Junio C Hamano
2018-05-23Merge branch 'ds/lazy-load-trees'Junio C Hamano
2018-05-21Move declaration for alias.c to alias.hNguyễn Thái Ngọc Duy
2018-05-08Merge branch 'js/ident-date-fix'Junio C Hamano
2018-05-06rebase --rebase-merges: root commits can be cousins, tooJohannes Schindelin
2018-05-06sequencer: learn about the special "fake root commit" handlingJohannes Schindelin
2018-05-06rebase --rebase-merges: a "merge" into a new root is a fast-forwardJohannes Schindelin
2018-05-06sequencer: allow introducing new root commitsJohannes Schindelin
2018-05-06sequencer: extract helper to update active_cache_treeJohannes Schindelin
2018-05-02sequencer: use the_hash_algo for empty tree object IDbrian m. carlson
2018-05-02sequencer: convert one use of EMPTY_TREE_SHA1_HEXbrian m. carlson
2018-05-01rebase --skip: clean up commit message after a failed fixup/squashJohannes Schindelin
2018-05-01sequencer: always commit without editing when asked forJohannes Schindelin
2018-05-01rebase -i: Handle "combination of <n> commits" with GETTEXT_POISONJohannes Schindelin
2018-04-26rebase -i: introduce --rebase-merges=[no-]rebase-cousinsJohannes Schindelin
2018-04-26rebase --rebase-merges: avoid "empty merges"Johannes Schindelin
2018-04-26sequencer: handle post-rewrite for merge commandsJohannes Schindelin
2018-04-26rebase-helper --make-script: introduce a flag to rebase mergesJohannes Schindelin
2018-04-26sequencer: fast-forward `merge` commands, if possibleJohannes Schindelin
2018-04-26sequencer: introduce the `merge` commandJohannes Schindelin
2018-04-26sequencer: introduce new commands to reset the revisionJohannes Schindelin
2018-04-26sequencer: offer helpful advice when a command was rescheduledJohannes Schindelin
2018-04-26sequencer: refactor how original todo list lines are accessedJohannes Schindelin
2018-04-26sequencer: make rearrange_squash() a bit more obviousJohannes Schindelin
2018-04-26sequencer: avoid using errno clobbered by rollback_lock_file()Johannes Schindelin
2018-04-26cache.h: add repository argument to oid_object_infoStefan Beller
2018-04-25Merge branch 'sb/filenames-with-dashes'Junio C Hamano
2018-04-25Merge branch 'pw/rebase-signoff'Junio C Hamano
2018-04-25Merge branch 'pw/rebase-keep-empty-fixes'Junio C Hamano
2018-04-18sequencer: reset the committer date before commitsJohannes Sixt
2018-04-11exec_cmd: rename to use dash in file nameStefan Beller
2018-04-11treewide: replace maybe_tree with accessor methodsDerrick Stolee
2018-04-11treewide: rename tree to maybe_treeDerrick Stolee
2018-04-11Merge branch 'bw/c-plus-plus' into ds/lazy-load-treesJunio C Hamano
2018-04-09Merge branch 'bc/object-id'Junio C Hamano
2018-03-29rebase: extend --signoff supportPhillip Wood
2018-03-29Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoffJunio C Hamano
2018-03-29rebase -i --keep-empty: don't prune empty commitsPhillip Wood
2018-03-21Merge branch 'ma/skip-writing-unchanged-index'Junio C Hamano
2018-03-14Merge branch 'ma/roll-back-lockfiles'Junio C Hamano
2018-03-14sha1_file: convert sha1_object_info* to object_idbrian m. carlson