summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)Author
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-08Merge branch 'js/ident-date-fix'Junio C Hamano
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
2018-03-14Convert find_unique_abbrev* to struct object_idbrian m. carlson
2018-03-14cache-tree: convert write_*_as_tree to object_idbrian m. carlson
2018-03-06Merge branch 'bw/c-plus-plus'Junio C Hamano
2018-03-06Merge branch 'rs/strbuf-read-file-or-whine'Junio C Hamano
2018-03-06Merge branch 'nd/rebase-show-current-patch'Junio C Hamano
2018-03-01write_locked_index(): add flag to avoid writing unchanged indexMartin Ågren
2018-02-28sequencer: do not roll back lockfile unnecessarilyMartin Ågren
2018-02-27sequencer: always roll back lock in `do_recursive_merge()`Martin Ågren
2018-02-27sequencer: make lockfiles non-staticMartin Ågren
2018-02-22sequencer: factor out strbuf_read_file_or_whine()René Scharfe
2018-02-15Merge branch 'po/object-id'Junio C Hamano
2018-02-14object: rename function 'typename' to 'type_name'Brandon Williams
2018-02-13Merge branch 'pw/sequencer-in-process-commit'Junio C Hamano
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADNguyễn Thái Ngọc Duy
2018-01-24sequencer: run 'prepare-commit-msg' hookPhillip Wood