summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/object-id'Junio C Hamano2018-05-301-2/+2
|\
| * sequencer: use the_hash_algo for empty tree object IDbrian m. carlson2018-05-021-1/+1
| * sequencer: convert one use of EMPTY_TREE_SHA1_HEXbrian m. carlson2018-05-021-1/+1
* | Merge branch 'js/sequencer-and-root-commits'Junio C Hamano2018-05-301-25/+181
|\ \
| * | rebase --rebase-merges: root commits can be cousins, tooJohannes Schindelin2018-05-061-1/+2
| * | rebase --rebase-merges: a "merge" into a new root is a fast-forwardJohannes Schindelin2018-05-061-0/+12
| * | sequencer: allow introducing new root commitsJohannes Schindelin2018-05-061-12/+28
| * | sequencer: learn about the special "fake root commit" handlingJohannes Schindelin2018-05-061-3/+121
| * | sequencer: extract helper to update active_cache_treeJohannes Schindelin2018-05-061-9/+18
* | | Merge branch 'js/rebase-recreate-merge'Junio C Hamano2018-05-231-37/+855
|\ \ \ | |/ /
| * | rebase -i: introduce --rebase-merges=[no-]rebase-cousinsJohannes Schindelin2018-04-261-0/+4
| * | rebase --rebase-merges: avoid "empty merges"Johannes Schindelin2018-04-261-0/+7
| * | sequencer: handle post-rewrite for merge commandsJohannes Schindelin2018-04-261-1/+4
| * | rebase-helper --make-script: introduce a flag to rebase mergesJohannes Schindelin2018-04-261-1/+345
| * | sequencer: fast-forward `merge` commands, if possibleJohannes Schindelin2018-04-261-1/+32
| * | sequencer: introduce the `merge` commandJohannes Schindelin2018-04-261-0/+200
| * | sequencer: introduce new commands to reset the revisionJohannes Schindelin2018-04-261-7/+206
| * | sequencer: offer helpful advice when a command was rescheduledJohannes Schindelin2018-04-261-0/+16
| * | sequencer: refactor how original todo list lines are accessedJohannes Schindelin2018-04-261-24/+36
| * | sequencer: make rearrange_squash() a bit more obviousJohannes Schindelin2018-04-261-1/+1
| * | sequencer: avoid using errno clobbered by rollback_lock_file()Johannes Schindelin2018-04-261-4/+6
* | | Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'Junio C Hamano2018-05-231-47/+146
|\ \ \
| * | | rebase --skip: clean up commit message after a failed fixup/squashJohannes Schindelin2018-05-021-13/+100
| * | | sequencer: always commit without editing when asked forJohannes Schindelin2018-05-021-0/+2
| * | | rebase -i: Handle "combination of <n> commits" with GETTEXT_POISONJohannes Schindelin2018-05-021-34/+44
* | | | Merge branch 'sb/oid-object-info'Junio C Hamano2018-05-231-1/+2
|\ \ \ \
| * | | | cache.h: add repository argument to oid_object_infoStefan Beller2018-04-261-1/+2
| | |_|/ | |/| |
* | | | Merge branch 'ds/lazy-load-trees'Junio C Hamano2018-05-231-6/+6
|\ \ \ \
| * | | | treewide: replace maybe_tree with accessor methodsDerrick Stolee2018-04-111-6/+6
| * | | | treewide: rename tree to maybe_treeDerrick Stolee2018-04-111-6/+6
| * | | | Merge branch 'bw/c-plus-plus' into ds/lazy-load-treesJunio C Hamano2018-04-111-1/+1
| |\ \ \ \
* | \ \ \ \ Merge branch 'js/ident-date-fix'Junio C Hamano2018-05-081-0/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | sequencer: reset the committer date before commitsJohannes Sixt2018-04-191-0/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sb/filenames-with-dashes'Junio C Hamano2018-04-251-1/+1
|\ \ \ \ \
| * | | | | exec_cmd: rename to use dash in file nameStefan Beller2018-04-111-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'pw/rebase-signoff'Junio C Hamano2018-04-251-1/+7
|\ \ \ \ \
| * | | | | rebase: extend --signoff supportPhillip Wood2018-03-291-1/+7
| * | | | | Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoffJunio C Hamano2018-03-291-2/+6
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'pw/rebase-keep-empty-fixes'Junio C Hamano2018-04-251-2/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| / / / / | |_|/ / / / |/| | | | |
| * | | | | rebase -i --keep-empty: don't prune empty commitsPhillip Wood2018-03-291-2/+6
* | | | | | Merge branch 'bc/object-id'Junio C Hamano2018-04-101-4/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | sha1_file: convert sha1_object_info* to object_idbrian m. carlson2018-03-141-1/+2
| * | | | | Convert find_unique_abbrev* to struct object_idbrian m. carlson2018-03-141-1/+1
| * | | | | cache-tree: convert write_*_as_tree to object_idbrian m. carlson2018-03-141-2/+2
* | | | | | Merge branch 'ma/skip-writing-unchanged-index'Junio C Hamano2018-03-211-6/+5
|\ \ \ \ \ \
| * | | | | | write_locked_index(): add flag to avoid writing unchanged indexma/skip-writing-unchanged-indexMartin Ågren2018-03-011-6/+5
* | | | | | | Merge branch 'ma/roll-back-lockfiles'Junio C Hamano2018-03-141-18/+14
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | sequencer: do not roll back lockfile unnecessarilyma/roll-back-lockfilesMartin Ågren2018-02-281-12/+6
| * | | | | sequencer: always roll back lock in `do_recursive_merge()`Martin Ågren2018-02-271-1/+3
| * | | | | sequencer: make lockfiles non-staticMartin Ågren2018-02-271-5/+5
| | |_|/ / | |/| | |
View Lorry Controller Status