summaryrefslogtreecommitdiffstats
path: root/sequencer.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* commit: add repository argument to lookup_commitStefan Beller2018-06-291-2/+2
* commit: add repository argument to lookup_commit_referenceStefan Beller2018-06-291-3/+3
* commit: add repository argument to lookup_commit_reference_gentlyStefan Beller2018-06-291-1/+1
* tree: add repository argument to lookup_treeStefan Beller2018-06-291-1/+1
* Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-291-25/+27
|\
| * path.c: migrate global git_path_* to take a repository argumentStefan Beller2018-05-181-18/+19
| * object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | Merge branch 'sb/plug-misc-leaks'Junio C Hamano2018-06-251-1/+3
|\ \
| * | sequencer.c: plug mem leak in git_sequencer_configStefan Beller2018-06-251-0/+1
| * | sequencer.c: plug leaks in do_pick_commitStefan Beller2018-06-041-1/+2
* | | Merge branch 'nd/commit-util-to-slab'Junio C Hamano2018-06-251-6/+18
|\ \ \
| * | | sequencer.c: use commit-slab to associate todo items to commitsNguyễn Thái Ngọc Duy2018-05-211-3/+9
| * | | sequencer.c: use commit-slab to mark seen commitsNguyễn Thái Ngọc Duy2018-05-211-3/+9
* | | | Merge branch 'js/rebase-i-root-fix'Junio C Hamano2018-06-181-1/+1
|\ \ \ \
| * | | | rebase --root: fix amending root commit messagesJohannes Schindelin2018-06-181-1/+1
* | | | | Merge branch 'js/rebase-recreate-merge'Junio C Hamano2018-06-011-1/+1
|\ \ \ \ \
| * | | | | sequencer: ensure labels that are object IDs are rewrittenbrian m. carlson2018-05-301-1/+1
* | | | | | Merge branch 'nd/command-list'Junio C Hamano2018-06-011-0/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Move declaration for alias.c to alias.hNguyễn Thái Ngọc Duy2018-05-211-0/+1
* | | | | | 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
| |\ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 13:54:03 +0100