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