From: Johannes Schindelin <johannes.schindelin@gmx.de> To: git@vger.kernel.org Cc: "Johannes Schindelin" <johannes.schindelin@gmx.de>, "Junio C Hamano" <gitster@pobox.com>, "Jacob Keller" <jacob.keller@gmail.com>, "Stefan Beller" <sbeller@google.com>, "Philip Oakley" <philipoakley@iee.org>, "Eric Sunshine" <sunshine@sunshineco.com>, "Phillip Wood" <phillip.wood@dunelm.org.uk>, "Igor Djordjevic" <igor.d.djordjevic@gmail.com>, "Johannes Sixt" <j6t@kdbg.org>, "Sergey Organov" <sorganov@gmail.com>, "Martin Ågren" <martin.agren@gmail.com> Subject: [PATCH v9 00/17] rebase -i: offer to recreate commit topology by rebasing merges Date: Wed, 25 Apr 2018 14:28:08 +0200 Message-ID: <cover.1524659287.git.johannes.schindelin@gmx.de> (raw) In-Reply-To: <cover.1524306546.git.johannes.schindelin@gmx.de> Junio, I think this is now ready for `next`. Thank you for your patience and help with this. Once upon a time, I dreamed of an interactive rebase that would not linearize all patches and drop all merge commits, but instead recreate the commit topology faithfully. My original attempt was --preserve-merges, but that design was so limited that I did not even enable it in interactive mode. Subsequently, it *was* enabled in interactive mode, with the predictable consequences: as the --preserve-merges design does not allow for specifying the parents of merge commits explicitly, all the new commits' parents are defined *implicitly* by the previous commit history, and hence it is *not possible to even reorder commits*. This design flaw cannot be fixed. Not without a complete re-design, at least. This patch series offers such a re-design. Think of --rebase-merges as "--preserve-merges done right". It introduces new verbs for the todo list, `label`, `reset` and `merge`. For a commit topology like this: A - B - C \ / D the generated todo list would look like this: # branch D pick 0123 A label branch-point pick 1234 D label D reset branch-point pick 2345 B merge -C 3456 D # C There are more patches in the pipeline, based on this patch series, but left for later in the interest of reviewable patch series: one mini series to use the sequencer even for `git rebase -i --root`, and another one to add support for octopus merges to --rebase-merges. And then one to allow for rebasing merge commits in a smarter way (this one will need a bit more work, though, as it can result in very complicated, nested merge conflicts *very* easily). Changes since v8: - Disentangled the patch introducing `label`/`reset` from the one introducing `merge` again (this was one stupid, tired `git commit --amend` too many). - Augmented the commit message of "introduce the `merge` command" to describe what the `label onto` is all about. - Fixed the error message when `reset` would overwrite untracked files to actually say that a "reset" failed (not a "merge"). - Clarified the rationale for `label onto` in the commit message of "rebase-helper --make-script: introduce a flag to rebase merges". - Edited the description of `--rebase-merges` heavily, for clarity, in "rebase: introduce the --rebase-merges option". - Edited the commit message of (and the documentation introduced by) " rebase -i: introduce --rebase-merges=[no-]rebase-cousins" for clarity (also mentioning the `--ancestry-path` option). - When run_git_commit() fails after a successful merge, we now take pains not to reschedule the `merge` command. - Rebased the patch series on top of current `master`, i.e. both `pw/rebase-keep-empty-fixes` and `pw/rebase-signoff`, to resolve merge conflicts myself. Johannes Schindelin (15): sequencer: avoid using errno clobbered by rollback_lock_file() sequencer: make rearrange_squash() a bit more obvious sequencer: refactor how original todo list lines are accessed sequencer: offer helpful advice when a command was rescheduled sequencer: introduce new commands to reset the revision sequencer: introduce the `merge` command sequencer: fast-forward `merge` commands, if possible rebase-helper --make-script: introduce a flag to rebase merges rebase: introduce the --rebase-merges option sequencer: make refs generated by the `label` command worktree-local sequencer: handle post-rewrite for merge commands rebase --rebase-merges: avoid "empty merges" pull: accept --rebase=merges to recreate the branch topology rebase -i: introduce --rebase-merges=[no-]rebase-cousins rebase -i --rebase-merges: add a section to the man page Phillip Wood (1): rebase --rebase-merges: add test for --keep-empty Stefan Beller (1): git-rebase--interactive: clarify arguments Documentation/config.txt | 8 + Documentation/git-pull.txt | 6 +- Documentation/git-rebase.txt | 163 ++++- builtin/pull.c | 14 +- builtin/rebase--helper.c | 13 +- builtin/remote.c | 18 +- contrib/completion/git-completion.bash | 4 +- git-rebase--interactive.sh | 22 +- git-rebase.sh | 16 + refs.c | 3 +- sequencer.c | 892 ++++++++++++++++++++++++- sequencer.h | 7 + t/t3421-rebase-topology-linear.sh | 1 + t/t3430-rebase-merges.sh | 244 +++++++ 14 files changed, 1352 insertions(+), 59 deletions(-) create mode 100755 t/t3430-rebase-merges.sh base-commit: 1f1cddd558b54bb0ce19c8ace353fd07b758510d Published-As: https://github.com/dscho/git/releases/tag/recreate-merges-v9 Fetch-It-Via: git fetch https://github.com/dscho/git recreate-merges-v9 Interdiff vs v8: diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index e691b93e920..bd5ecff980e 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -381,21 +381,24 @@ have the long commit hash prepended to the format. -r:: --rebase-merges[=(rebase-cousins|no-rebase-cousins)]:: - By default, a rebase will simply drop merge commits and only rebase - the non-merge commits. With this option, it will try to preserve + By default, a rebase will simply drop merge commits from the todo + list, and put the rebased commits into a single, linear branch. + With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, - by recreating the merge commits. If a merge commit resolved any merge - or contained manual amendments, then they will have to be re-applied - manually. + by recreating the merge commits. Any resolved merge conflicts or + manual amendments in these merge commits will have to be + resolved/re-applied manually. + By default, or when `no-rebase-cousins` was specified, commits which do not -have `<upstream>` as direct ancestor will keep their original branch point. -If the `rebase-cousins` mode is turned on, such commits are instead rebased +have `<upstream>` as direct ancestor will keep their original branch point, +i.e. commits that would be excluded by gitlink:git-log[1]'s +`--ancestry-path` option will keep their original ancestry by default. If +the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified). + -This mode is similar in spirit to `--preserve-merges`, but in contrast to -that option works well in interactive rebases: commits can be reordered, -inserted and dropped at will. +The `--rebase-merges` mode is similar in spirit to `--preserve-merges`, but +in contrast to that option works well in interactive rebases: commits can be +reordered, inserted and dropped at will. + It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via diff --git a/sequencer.c b/sequencer.c index b5715f69450..e2f83942843 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2635,6 +2635,7 @@ static int do_reset(const char *name, int len, struct replay_opts *opts) } memset(&unpack_tree_opts, 0, sizeof(unpack_tree_opts)); + setup_unpack_trees_porcelain(&unpack_tree_opts, "reset"); unpack_tree_opts.head_idx = 1; unpack_tree_opts.src_index = &the_index; unpack_tree_opts.dst_index = &the_index; @@ -2855,7 +2856,12 @@ static int do_merge(struct commit *commit, const char *arg, int arg_len, if (ret) rerere(opts->allow_rerere_auto); else - ret = run_git_commit(git_path_merge_msg(), opts, + /* + * In case of problems, we now want to return a positive + * value (a negative one would indicate that the `merge` + * command needs to be rescheduled). + */ + ret = !!run_git_commit(git_path_merge_msg(), opts, run_commit_flags); leave_merge: @@ -3809,12 +3815,9 @@ int sequencer_make_script(FILE *out, int argc, const char **argv, init_revisions(&revs, NULL); revs.verbose_header = 1; - if (rebase_merges) - revs.cherry_mark = 1; - else { + if (!rebase_merges) revs.max_parents = 1; - revs.cherry_pick = 1; - } + revs.cherry_mark = 1; revs.limited = 1; revs.reverse = 1; revs.right_only = 1; -- 2.17.0.windows.1.33.gfcbb1fa0445
next prev parent reply other threads:[~2018-04-25 12:28 UTC|newest] Thread overview: 412+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-01-18 15:35 [PATCH 0/8] rebase -i: offer to recreate merge commits Johannes Schindelin 2018-01-18 15:35 ` [PATCH 1/8] sequencer: introduce new commands to reset the revision Johannes Schindelin 2018-01-18 16:25 ` Jacob Keller 2018-01-18 21:13 ` Johannes Schindelin 2018-01-18 21:21 ` Jacob Keller 2018-01-18 21:24 ` Philip Oakley 2018-01-18 21:28 ` Jacob Keller 2018-01-29 20:28 ` Johannes Schindelin 2018-01-22 21:25 ` Junio C Hamano 2018-01-29 22:00 ` Johannes Schindelin 2018-01-19 8:59 ` Eric Sunshine 2018-01-24 22:01 ` Junio C Hamano 2018-01-29 20:55 ` Johannes Schindelin 2018-01-29 20:50 ` Johannes Schindelin 2018-01-30 7:12 ` Eric Sunshine 2018-01-19 12:24 ` [PATCH 1/8] sequencer: introduce new commands to resettherevision Phillip Wood 2018-01-19 18:55 ` Phillip Wood 2018-01-19 18:59 ` Jacob Keller 2018-01-29 21:25 ` Johannes Schindelin 2018-01-29 21:29 ` Johannes Schindelin 2018-01-29 21:23 ` Johannes Schindelin 2018-01-18 15:35 ` [PATCH 2/8] sequencer: introduce the `merge` command Johannes Schindelin 2018-01-18 16:31 ` Jacob Keller 2018-01-18 21:22 ` Johannes Schindelin 2018-01-18 21:26 ` Jacob Keller 2018-01-19 9:54 ` Eric Sunshine 2018-01-19 14:45 ` Phillip Wood 2018-01-20 9:18 ` Jacob Keller 2018-01-29 21:41 ` Johannes Schindelin 2018-01-31 13:48 ` Johannes Schindelin 2018-01-31 17:58 ` Phillip Wood 2018-02-01 6:40 ` Jacob Keller 2018-01-22 22:12 ` Junio C Hamano 2018-01-29 22:15 ` Johannes Schindelin 2018-01-18 15:35 ` [PATCH 3/8] sequencer: fast-forward merge commits, if possible Johannes Schindelin 2018-01-19 14:53 ` Phillip Wood 2018-01-23 19:12 ` Junio C Hamano 2018-01-24 10:32 ` Phillip Wood 2018-01-24 18:51 ` Junio C Hamano 2018-01-29 21:47 ` Johannes Schindelin 2018-01-23 18:51 ` Junio C Hamano 2018-01-29 22:18 ` Johannes Schindelin 2018-01-18 15:35 ` [PATCH 4/8] rebase-helper --make-script: introduce a flag to recreate merges Johannes Schindelin 2018-01-18 21:39 ` Philip Oakley 2018-01-19 10:34 ` Eric Sunshine 2018-01-23 20:13 ` Junio C Hamano 2018-01-29 21:07 ` Johannes Schindelin 2018-01-29 21:05 ` Johannes Schindelin 2018-01-23 20:03 ` Junio C Hamano 2018-01-29 22:37 ` Johannes Schindelin 2018-01-18 15:35 ` [PATCH 5/8] rebase: introduce the --recreate-merges option Johannes Schindelin 2018-01-19 10:55 ` Eric Sunshine 2018-01-29 21:09 ` Johannes Schindelin 2018-01-23 20:22 ` Junio C Hamano 2018-02-10 19:31 ` Johannes Schindelin 2018-02-07 6:16 ` Sergey Organov 2018-02-07 7:26 ` Jacob Keller 2018-02-07 9:47 ` Sergey Organov 2018-02-07 7:27 ` Johannes Sixt 2018-02-07 17:36 ` Johannes Schindelin 2018-02-07 22:58 ` Øyvind Rønningstad 2018-02-07 23:31 ` Junio C Hamano 2018-02-08 12:34 ` Johannes Schindelin 2018-02-14 5:41 ` Sergey Organov 2018-02-09 6:11 ` Sergey Organov 2018-02-09 7:13 ` Johannes Sixt 2018-02-11 10:16 ` Jacob Keller 2018-02-12 7:38 ` Sergey Organov 2018-02-09 6:50 ` Sergey Organov 2018-02-10 23:06 ` Johannes Schindelin 2018-02-12 4:58 ` Sergey Organov 2018-02-12 20:21 ` Johannes Schindelin 2018-02-13 6:44 ` Sergey Organov 2018-02-15 1:08 ` Johannes Schindelin 2018-02-15 4:28 ` Sergey Organov 2018-02-15 16:51 ` Johannes Schindelin 2018-02-12 5:22 ` Sergey Organov 2018-02-12 20:39 ` Johannes Schindelin 2018-02-13 4:39 ` Jacob Keller 2018-02-13 7:15 ` Sergey Organov 2018-02-14 1:35 ` Jacob Keller 2018-02-15 1:14 ` Johannes Schindelin 2018-02-15 4:35 ` Sergey Organov 2018-02-15 16:50 ` Johannes Schindelin 2018-02-13 6:43 ` Sergey Organov 2018-02-15 1:40 ` Johannes Schindelin 2018-01-18 15:35 ` [PATCH 6/8] sequencer: handle autosquash and post-rewrite for merge commands Johannes Schindelin 2018-01-18 16:43 ` Jacob Keller 2018-01-18 21:27 ` Johannes Schindelin 2018-01-18 21:29 ` Jacob Keller 2018-01-23 20:27 ` Junio C Hamano 2018-01-18 15:36 ` [PATCH 7/8] pull: accept --rebase=recreate to recreate the branch topology Johannes Schindelin 2018-01-18 15:36 ` [PATCH 8/8] rebase -i: introduce --recreate-merges=no-rebase-cousins Johannes Schindelin 2018-01-18 22:00 ` Philip Oakley 2018-01-29 20:42 ` Johannes Schindelin 2018-01-20 1:09 ` Eric Sunshine 2018-01-18 16:49 ` [PATCH 0/8] rebase -i: offer to recreate merge commits Jacob Keller 2018-01-18 18:36 ` [PATCH 9, 10/8] interactive rebase feedback Stefan Beller 2018-01-18 18:36 ` [PATCH 9/8] [DO NOT APPLY, but squash?] git-rebase--interactive: clarify arguments Stefan Beller 2018-01-18 21:18 ` Jacob Keller 2018-01-18 21:36 ` Johannes Schindelin 2018-01-18 21:58 ` Stefan Beller 2018-01-19 20:30 ` Junio C Hamano 2018-01-20 9:14 ` Jacob Keller 2018-01-29 17:02 ` Johannes Schindelin 2018-01-18 18:36 ` [PATCH 10/8] [DO NOT APPLY, but improve?] rebase--interactive: introduce "stop" command Stefan Beller 2018-01-18 21:20 ` Jacob Keller 2018-01-18 22:08 ` Philip Oakley 2018-01-18 22:09 ` Jacob Keller 2018-01-18 22:00 ` Johannes Schindelin 2018-01-18 22:09 ` Stefan Beller 2018-01-19 20:25 ` [PATCH 0/8] rebase -i: offer to recreate merge commits Junio C Hamano 2018-01-29 21:53 ` Johannes Schindelin 2018-01-23 20:29 ` Junio C Hamano 2018-01-29 22:53 ` Johannes Schindelin 2018-01-29 22:54 ` [PATCH v2 00/10] " Johannes Schindelin 2018-01-29 22:54 ` [PATCH v2 01/10] git-rebase--interactive: clarify arguments Johannes Schindelin 2018-01-29 22:54 ` [PATCH v2 02/10] sequencer: introduce new commands to reset the revision Johannes Schindelin 2018-01-30 8:06 ` Eric Sunshine 2018-02-10 20:58 ` Johannes Schindelin 2018-01-30 20:17 ` Stefan Beller 2018-01-31 13:21 ` Johannes Schindelin 2018-01-31 18:02 ` [PATCH v2 02/10] sequencer: introduce new commands to reset therevision Phillip Wood 2018-02-10 21:49 ` Johannes Schindelin 2018-01-29 22:54 ` [PATCH v2 03/10] sequencer: introduce the `merge` command Johannes Schindelin 2018-01-29 22:54 ` [PATCH v2 04/10] sequencer: fast-forward merge commits, if possible Johannes Schindelin 2018-01-29 22:54 ` [PATCH v2 05/10] rebase-helper --make-script: introduce a flag to recreate merges Johannes Schindelin 2018-01-29 22:54 ` [PATCH v2 06/10] rebase: introduce the --recreate-merges option Johannes Schindelin 2018-01-29 22:54 ` [PATCH v2 07/10] sequencer: make refs generated by the `label` command worktree-local Johannes Schindelin 2018-01-29 22:55 ` [PATCH v2 08/10] sequencer: handle autosquash and post-rewrite for merge commands Johannes Schindelin 2018-01-29 22:55 ` [PATCH v2 09/10] pull: accept --rebase=recreate to recreate the branch topology Johannes Schindelin 2018-01-29 22:55 ` [PATCH v2 10/10] rebase -i: introduce --recreate-merges=[no-]rebase-cousins Johannes Schindelin 2018-01-30 18:47 ` [PATCH v2 00/10] rebase -i: offer to recreate merge commits Stefan Beller 2018-01-31 13:08 ` Johannes Schindelin 2018-01-30 21:36 ` Junio C Hamano 2018-01-31 13:29 ` Johannes Schindelin 2018-02-01 6:37 ` Jacob Keller 2018-02-11 0:09 ` [PATCH v3 00/12] " Johannes Schindelin 2018-02-11 0:10 ` [PATCH v3 01/12] sequencer: avoid using errno clobbered by rollback_lock_file() Johannes Schindelin 2018-02-11 0:10 ` [PATCH v3 02/12] sequencer: make rearrange_squash() a bit more obvious Johannes Schindelin 2018-02-11 0:10 ` [PATCH v3 03/12] git-rebase--interactive: clarify arguments Johannes Schindelin 2018-02-11 0:10 ` [PATCH v3 04/12] sequencer: introduce new commands to reset the revision Johannes Schindelin 2018-02-12 19:26 ` Eric Sunshine 2018-02-12 20:46 ` Johannes Schindelin 2018-02-11 0:10 ` [PATCH v3 05/12] sequencer: introduce the `merge` command Johannes Schindelin 2018-02-12 8:48 ` Eric Sunshine 2018-02-12 20:17 ` Johannes Schindelin 2018-02-11 0:10 ` [PATCH v3 06/12] sequencer: fast-forward merge commits, if possible Johannes Schindelin 2018-02-11 0:10 ` [PATCH v3 07/12] rebase-helper --make-script: introduce a flag to recreate merges Johannes Schindelin 2018-02-11 0:10 ` [PATCH v3 08/12] rebase: introduce the --recreate-merges option Johannes Schindelin 2018-02-11 0:10 ` [PATCH v3 09/12] sequencer: make refs generated by the `label` command worktree-local Johannes Schindelin 2018-02-11 0:10 ` [PATCH v3 10/12] sequencer: handle post-rewrite for merge commands Johannes Schindelin 2018-02-11 0:10 ` [PATCH v3 11/12] pull: accept --rebase=recreate to recreate the branch topology Johannes Schindelin 2018-02-11 0:10 ` [PATCH v3 12/12] rebase -i: introduce --recreate-merges=[no-]rebase-cousins Johannes Schindelin 2018-02-23 12:35 ` [PATCH v4 00/12] rebase -i: offer to recreate merge commits Johannes Schindelin 2018-02-23 12:35 ` [PATCH v4 01/12] sequencer: avoid using errno clobbered by rollback_lock_file() Johannes Schindelin 2018-02-23 12:36 ` [PATCH v4 02/12] sequencer: make rearrange_squash() a bit more obvious Johannes Schindelin 2018-02-23 12:36 ` [PATCH v4 03/12] git-rebase--interactive: clarify arguments Johannes Schindelin 2018-02-23 12:37 ` [PATCH v4 04/12] sequencer: introduce new commands to reset the revision Johannes Schindelin 2018-02-23 12:37 ` [PATCH v4 05/12] sequencer: introduce the `merge` command Johannes Schindelin 2018-02-23 12:37 ` [PATCH v4 06/12] sequencer: fast-forward merge commits, if possible Johannes Schindelin 2018-02-23 12:38 ` [PATCH v4 07/12] rebase-helper --make-script: introduce a flag to recreate merges Johannes Schindelin 2018-02-23 12:38 ` [PATCH v4 08/12] rebase: introduce the --recreate-merges option Johannes Schindelin 2018-02-23 12:38 ` [PATCH v4 09/12] sequencer: make refs generated by the `label` command worktree-local Johannes Schindelin 2018-02-23 12:39 ` [PATCH v4 10/12] sequencer: handle post-rewrite for merge commands Johannes Schindelin 2018-02-23 12:39 ` [PATCH v4 11/12] pull: accept --rebase=recreate to recreate the branch topology Johannes Schindelin 2018-02-23 12:39 ` [PATCH v4 12/12] rebase -i: introduce --recreate-merges=[no-]rebase-cousins Johannes Schindelin 2018-02-25 10:54 ` [PATCH v4 00/12] rebase -i: offer to recreate merge commits Jacob Keller 2018-02-26 20:49 ` Johannes Schindelin 2018-02-26 21:29 ` [PATCH v5 " Johannes Schindelin 2018-02-26 21:29 ` [PATCH v5 01/12] sequencer: avoid using errno clobbered by rollback_lock_file() Johannes Schindelin 2018-02-27 21:33 ` Martin Ågren 2018-03-02 20:33 ` Johannes Schindelin 2018-02-26 21:29 ` [PATCH v5 02/12] sequencer: make rearrange_squash() a bit more obvious Johannes Schindelin 2018-02-26 21:29 ` [PATCH v5 03/12] git-rebase--interactive: clarify arguments Johannes Schindelin 2018-02-26 21:29 ` [PATCH v5 04/12] sequencer: introduce new commands to reset the revision Johannes Schindelin 2018-02-26 21:29 ` [PATCH v5 05/12] sequencer: introduce the `merge` command Johannes Schindelin 2018-02-26 21:29 ` [PATCH v5 06/12] sequencer: fast-forward merge commits, if possible Johannes Schindelin 2018-02-26 21:29 ` [PATCH v5 07/12] rebase-helper --make-script: introduce a flag to recreate merges Johannes Schindelin 2018-02-26 21:29 ` [PATCH v5 08/12] rebase: introduce the --recreate-merges option Johannes Schindelin 2018-02-26 21:29 ` [PATCH v5 09/12] sequencer: make refs generated by the `label` command worktree-local Johannes Schindelin 2018-02-26 21:29 ` [PATCH v5 10/12] sequencer: handle post-rewrite for merge commands Johannes Schindelin 2018-02-26 21:29 ` [PATCH v5 11/12] pull: accept --rebase=recreate to recreate the branch topology Johannes Schindelin 2018-02-26 21:29 ` [PATCH v5 12/12] rebase -i: introduce --recreate-merges=[no-]rebase-cousins Johannes Schindelin 2018-03-06 4:02 ` [PATCH v5 00/12] rebase -i: offer to recreate merge commits Igor Djordjevic 2018-03-07 13:50 ` Johannes Schindelin 2018-04-10 12:29 ` [PATCH v6 00/15] rebase -i: offer to recreate commit topology Johannes Schindelin 2018-04-10 12:29 ` [PATCH v6 01/15] sequencer: avoid using errno clobbered by rollback_lock_file() Johannes Schindelin 2018-04-10 12:29 ` [PATCH v6 02/15] sequencer: make rearrange_squash() a bit more obvious Johannes Schindelin 2018-04-10 12:29 ` [PATCH v6 03/15] git-rebase--interactive: clarify arguments Johannes Schindelin 2018-04-10 12:29 ` [PATCH v6 04/15] sequencer: introduce new commands to reset the revision Johannes Schindelin 2018-04-11 6:17 ` Sergey Organov 2018-04-11 11:36 ` Johannes Schindelin 2018-04-11 16:07 ` Sergey Organov 2018-04-13 10:03 ` Phillip Wood 2018-04-15 17:17 ` Philip Oakley 2018-04-18 18:00 ` Phillip Wood 2018-04-10 12:29 ` [PATCH v6 05/15] sequencer: introduce the `merge` command Johannes Schindelin 2018-04-13 10:12 ` Phillip Wood 2018-04-13 17:57 ` Phillip Wood 2018-04-14 0:51 ` Johannes Schindelin 2018-04-18 18:04 ` Phillip Wood 2018-04-19 12:03 ` Johannes Schindelin 2018-04-10 12:29 ` [PATCH v6 06/15] sequencer: fast-forward `merge` commands, if possible Johannes Schindelin 2018-04-10 12:29 ` [PATCH v6 07/15] rebase-helper --make-script: introduce a flag to rebase merges Johannes Schindelin 2018-04-10 12:29 ` [PATCH v6 08/15] rebase: introduce the --rebase-merges option Johannes Schindelin 2018-04-10 12:30 ` [PATCH v6 09/15] rebase --rebase-merges: add test for --keep-empty Johannes Schindelin 2018-04-10 12:30 ` [PATCH v6 10/15] sequencer: make refs generated by the `label` command worktree-local Johannes Schindelin 2018-04-10 12:30 ` [PATCH v6 11/15] sequencer: handle post-rewrite for merge commands Johannes Schindelin 2018-04-10 12:30 ` [PATCH v6 12/15] rebase --rebase-merges: avoid "empty merges" Johannes Schindelin 2018-04-10 12:30 ` [PATCH v6 13/15] pull: accept --rebase=merges to recreate the branch topology Johannes Schindelin 2018-04-10 12:30 ` [PATCH v6 14/15] rebase -i: introduce --rebase-merges=[no-]rebase-cousins Johannes Schindelin 2018-04-12 11:30 ` Sergey Organov 2018-04-10 12:30 ` [PATCH v6 15/15] rebase -i --rebase-merges: add a section to the man page Johannes Schindelin 2018-04-10 18:49 ` Martin Ågren 2018-04-10 21:56 ` Johannes Schindelin 2018-04-11 15:35 ` Phillip Wood 2018-04-11 19:10 ` Eric Sunshine 2018-04-12 9:00 ` Johannes Schindelin 2018-04-13 15:21 ` Phillip Wood 2018-04-12 9:30 ` Johannes Schindelin 2018-04-12 18:29 ` Jacob Keller 2018-04-13 15:27 ` Phillip Wood 2018-04-12 11:52 ` Sergey Organov 2018-04-10 14:52 ` [PATCH v6 00/15] rebase -i: offer to recreate commit topology Sergey Organov 2018-04-10 22:11 ` Johannes Schindelin 2018-04-11 4:54 ` Sergey Organov 2018-04-11 11:28 ` Johannes Schindelin 2018-04-11 13:13 ` Sergey Organov 2018-04-11 20:40 ` Johannes Schindelin 2018-04-12 8:34 ` Sergey Organov 2018-04-12 12:31 ` Johannes Schindelin 2018-04-11 23:52 ` Jacob Keller 2018-04-12 5:42 ` Sergey Organov 2018-04-12 17:03 ` Jacob Keller 2018-04-12 22:02 ` Johannes Schindelin 2018-04-12 22:14 ` Jacob Keller 2018-04-13 12:08 ` Johannes Schindelin 2018-04-13 15:43 ` Phillip Wood 2018-04-13 23:48 ` Johannes Schindelin 2018-04-19 4:24 ` Sergey Organov 2018-04-19 8:23 ` Jacob Keller 2018-04-19 11:28 ` Sergey Organov 2018-04-20 8:26 ` Johannes Schindelin 2018-04-20 20:39 ` Jacob Keller 2018-04-18 5:23 ` Sergey Organov 2018-04-19 12:12 ` [PATCH v7 00/17] " Johannes Schindelin 2018-04-19 12:15 ` [PATCH v7 01/17] sequencer: avoid using errno clobbered by rollback_lock_file() Johannes Schindelin 2018-04-19 12:18 ` [PATCH v7 02/17] sequencer: make rearrange_squash() a bit more obvious Johannes Schindelin 2018-04-19 12:19 ` [PATCH v7 03/17] sequencer: refactor how original todo list lines are accessed Johannes Schindelin 2018-04-19 12:19 ` [PATCH v7 04/17] sequencer: offer helpful advice when a command was rescheduled Johannes Schindelin 2018-04-19 12:20 ` [PATCH v7 05/17] git-rebase--interactive: clarify arguments Johannes Schindelin 2018-04-19 12:20 ` [PATCH v7 06/17] sequencer: introduce new commands to reset the revision Johannes Schindelin 2018-04-20 9:39 ` Phillip Wood 2018-04-20 22:39 ` Johannes Schindelin 2018-04-19 12:20 ` [PATCH v7 07/17] # This is a combination of 2 commits. # This is the 1st commit message: Johannes Schindelin 2018-04-20 5:38 ` Eric Sunshine 2018-04-20 8:34 ` Johannes Schindelin 2018-04-20 21:06 ` [PATCH v2 0/4] rebase -i: avoid stale "# This is a combination of" in commit messages Johannes Schindelin 2018-04-20 21:07 ` [PATCH v2 1/4] rebase -i: demonstrate bugs with fixup!/squash! " Johannes Schindelin 2018-04-20 21:07 ` [PATCH v2 2/4] rebase -i: Handle "combination of <n> commits" with GETTEXT_POISON Johannes Schindelin 2018-04-20 21:16 ` Stefan Beller 2018-04-21 7:20 ` Johannes Schindelin 2018-04-20 21:07 ` [PATCH v2 3/4] sequencer: leave a tell-tale when a fixup/squash failed Johannes Schindelin 2018-04-20 21:25 ` Stefan Beller 2018-04-21 7:24 ` Johannes Schindelin 2018-04-20 21:08 ` [PATCH v2 4/4] rebase --skip: clean up commit message after a failed fixup/squash Johannes Schindelin 2018-04-21 7:34 ` [PATCH v3 0/4] rebase -i: avoid stale "# This is a combination of" in commit messages Johannes Schindelin 2018-04-21 7:35 ` [PATCH v3 1/4] rebase -i: demonstrate bugs with fixup!/squash! " Johannes Schindelin 2018-04-21 7:35 ` [PATCH v3 2/4] rebase -i: Handle "combination of <n> commits" with GETTEXT_POISON Johannes Schindelin 2018-04-21 7:35 ` [PATCH v3 3/4] sequencer: leave a tell-tale when a fixup/squash failed Johannes Schindelin 2018-04-21 7:39 ` [PATCH v3 4/4] rebase --skip: clean up commit message after a failed fixup/squash Johannes Schindelin 2018-04-23 18:11 ` [PATCH v3 0/4] rebase -i: avoid stale "# This is a combination of" in commit messages Stefan Beller 2018-04-23 19:50 ` [PATCH v3 0/4] rebase -i: avoid stale "# This is a combinationof" " Phillip Wood 2018-04-25 12:48 ` Johannes Schindelin 2018-04-25 17:09 ` Phillip Wood 2018-04-26 9:51 ` Johannes Schindelin 2018-04-26 10:52 ` Phillip Wood 2018-04-24 1:28 ` [PATCH v3 0/4] rebase -i: avoid stale "# This is a combination of" " Junio C Hamano 2018-04-27 20:48 ` [PATCH v4 " Johannes Schindelin 2018-04-27 20:48 ` [PATCH v4 1/4] rebase -i: demonstrate bugs with fixup!/squash! " Johannes Schindelin 2018-04-27 20:48 ` [PATCH v4 2/4] rebase -i: Handle "combination of <n> commits" with GETTEXT_POISON Johannes Schindelin 2018-04-27 20:48 ` [PATCH v4 3/4] sequencer: always commit without editing when asked for Johannes Schindelin 2018-04-27 20:48 ` [PATCH v4 4/4] rebase --skip: clean up commit message after a failed fixup/squash Johannes Schindelin 2018-04-27 21:28 ` Stefan Beller 2018-04-28 13:05 ` Johannes Schindelin 2018-05-06 17:50 ` Phillip Wood 2018-05-09 10:50 ` Phillip Wood 2018-10-02 13:50 ` Johannes Schindelin 2018-10-08 13:37 ` Phillip Wood 2018-04-19 12:21 ` [PATCH v7 08/17] sequencer: fast-forward `merge` commands, if possible Johannes Schindelin 2018-04-19 12:21 ` [PATCH v7 09/17] rebase-helper --make-script: introduce a flag to rebase merges Johannes Schindelin 2018-04-19 12:21 ` [PATCH v7 10/17] rebase: introduce the --rebase-merges option Johannes Schindelin 2018-04-19 12:22 ` [PATCH v7 11/17] rebase --rebase-merges: add test for --keep-empty Johannes Schindelin 2018-04-19 12:22 ` [PATCH v7 12/17] sequencer: make refs generated by the `label` command worktree-local Johannes Schindelin 2018-04-19 12:23 ` [PATCH v7 13/17] sequencer: handle post-rewrite for merge commands Johannes Schindelin 2018-04-19 12:23 ` [PATCH v7 14/17] rebase --rebase-merges: avoid "empty merges" Johannes Schindelin 2018-04-19 12:23 ` [PATCH v7 15/17] pull: accept --rebase=merges to recreate the branch topology Johannes Schindelin 2018-04-19 12:24 ` [PATCH v7 16/17] rebase -i: introduce --rebase-merges=[no-]rebase-cousins Johannes Schindelin 2018-04-19 12:24 ` [PATCH v7 17/17] rebase -i --rebase-merges: add a section to the man page Johannes Schindelin 2018-04-21 10:29 ` [PATCH v8 00/16] rebase -i: offer to recreate commit topology by rebasing merges Johannes Schindelin 2018-04-21 10:30 ` [PATCH v8 01/16] sequencer: avoid using errno clobbered by rollback_lock_file() Johannes Schindelin 2018-04-21 10:30 ` [PATCH v8 02/16] sequencer: make rearrange_squash() a bit more obvious Johannes Schindelin 2018-04-21 10:31 ` [PATCH v8 03/16] sequencer: refactor how original todo list lines are accessed Johannes Schindelin 2018-04-21 10:31 ` [PATCH v8 04/16] sequencer: offer helpful advice when a command was rescheduled Johannes Schindelin 2018-04-21 10:32 ` [PATCH v8 05/16] git-rebase--interactive: clarify arguments Johannes Schindelin 2018-04-21 10:33 ` [PATCH v8 06/16] sequencer: introduce the `merge` command Johannes Schindelin 2018-04-21 15:56 ` Phillip Wood 2018-04-22 17:17 ` Phillip Wood 2018-04-23 12:22 ` Johannes Schindelin 2018-04-23 12:20 ` Johannes Schindelin 2018-04-23 15:54 ` Phillip Wood 2018-04-24 5:13 ` Martin Ågren 2018-04-24 5:13 ` [PATCH 1/2] merge: setup `opts` later in `checkout_fast_forward()` Martin Ågren 2018-04-24 6:20 ` Jacob Keller 2018-04-24 9:36 ` Martin Ågren 2018-04-24 11:30 ` Johannes Schindelin 2018-04-24 5:13 ` [PATCH 2/2] unpack_trees_options: free messages when done Martin Ågren 2018-04-24 16:29 ` Elijah Newren 2018-04-28 11:32 ` Martin Ågren 2018-04-28 12:30 ` Johannes Schindelin 2018-04-28 20:56 ` Elijah Newren 2018-05-16 14:32 ` Elijah Newren 2018-05-16 16:30 ` [PATCH v2 0/3] " Martin Ågren 2018-05-16 16:30 ` [PATCH v2 1/3] merge: setup `opts` later in `checkout_fast_forward()` Martin Ågren 2018-05-16 16:41 ` Stefan Beller 2018-05-16 19:29 ` Martin Ågren 2018-05-16 21:21 ` Jacob Keller 2018-05-16 21:20 ` Jacob Keller 2018-05-17 21:48 ` Junio C Hamano 2018-05-18 1:59 ` Jacob Keller 2018-05-16 16:30 ` [PATCH v2 2/3] merge-recursive: provide pair of `unpack_trees_{start,finish}()` Martin Ågren 2018-05-16 16:31 ` [PATCH v2 3/3] unpack_trees_options: free messages when done Martin Ågren 2018-05-17 22:10 ` Junio C Hamano 2018-05-18 5:08 ` Martin Ågren 2018-05-18 21:23 ` [PATCH v3 0/3] " Martin Ågren 2018-05-18 21:23 ` [PATCH v3 1/3] merge: setup `opts` later in `checkout_fast_forward()` Martin Ågren 2018-05-18 21:23 ` [PATCH v3 2/3] merge-recursive: provide pair of `unpack_trees_{start,finish}()` Martin Ågren 2018-05-18 21:23 ` [PATCH v3 3/3] unpack_trees_options: free messages when done Martin Ågren 2018-05-18 21:33 ` Jeff King 2018-05-18 22:30 ` Elijah Newren 2018-05-19 1:02 ` Jeff King 2018-05-19 6:13 ` Martin Ågren 2018-05-20 10:17 ` [PATCH v4 0/4] " Martin Ågren 2018-05-20 10:17 ` [PATCH v4 1/4] merge: setup `opts` later in `checkout_fast_forward()` Martin Ågren 2018-05-20 10:17 ` [PATCH v4 2/4] merge-recursive: provide pair of `unpack_trees_{start,finish}()` Martin Ågren 2018-05-20 10:17 ` [PATCH v4 3/4] string-list: provide `string_list_appendf()` Martin Ågren 2018-05-20 19:12 ` Jacob Keller 2018-05-21 0:01 ` Re*: " Junio C Hamano 2018-05-21 0:25 ` Junio C Hamano 2018-05-21 2:39 ` Jeff King 2018-05-21 14:54 ` [PATCH v5 0/4] unpack_trees_options: free messages when done Martin Ågren 2018-05-21 14:54 ` [PATCH v5 1/4] merge: setup `opts` later in `checkout_fast_forward()` Martin Ågren 2018-05-21 14:54 ` [PATCH v5 2/4] merge-recursive: provide pair of `unpack_trees_{start,finish}()` Martin Ågren 2018-05-21 14:54 ` [PATCH v5 3/4] argv-array: return the pushed string from argv_push*() Martin Ågren 2018-05-21 14:54 ` [PATCH v5 4/4] unpack_trees_options: free messages when done Martin Ågren 2018-05-21 21:38 ` [PATCH v5 0/4] " Jeff King 2018-05-22 2:46 ` Junio C Hamano 2018-05-22 2:54 ` Junio C Hamano 2018-05-22 11:11 ` Martin Ågren 2018-05-23 0:48 ` Junio C Hamano 2018-05-21 2:38 ` Re*: [PATCH v4 3/4] string-list: provide `string_list_appendf()` Jeff King 2018-05-20 10:17 ` [PATCH v4 4/4] unpack_trees_options: free messages when done Martin Ågren 2018-05-16 21:54 ` [PATCH v2 0/3] " Elijah Newren 2018-05-17 12:09 ` Ben Peart 2018-04-24 8:22 ` [PATCH v8 06/16] sequencer: introduce the `merge` command Johannes Schindelin 2018-04-22 12:01 ` Philip Oakley 2018-04-23 12:03 ` Johannes Schindelin 2018-04-23 20:34 ` Philip Oakley 2018-04-24 8:11 ` Johannes Schindelin 2018-04-24 19:41 ` Philip Oakley 2018-04-22 13:55 ` Philip Oakley 2018-04-21 10:33 ` [PATCH v8 07/16] sequencer: fast-forward `merge` commands, if possible Johannes Schindelin 2018-04-21 10:34 ` [PATCH v8 08/16] rebase-helper --make-script: introduce a flag to rebase merges Johannes Schindelin 2018-04-22 13:42 ` Philip Oakley 2018-04-24 8:33 ` Johannes Schindelin 2018-04-21 10:34 ` [PATCH v8 09/16] rebase: introduce the --rebase-merges option Johannes Schindelin 2018-04-22 14:15 ` Philip Oakley 2018-04-24 5:01 ` Junio C Hamano 2018-04-24 9:03 ` Johannes Schindelin 2018-04-24 8:40 ` Johannes Schindelin 2018-04-22 14:37 ` Philip Oakley 2018-04-24 10:52 ` Johannes Schindelin 2018-04-21 10:35 ` [PATCH v8 10/16] rebase --rebase-merges: add test for --keep-empty Johannes Schindelin 2018-04-21 10:43 ` [PATCH v8 11/16] sequencer: make refs generated by the `label` command worktree-local Johannes Schindelin 2018-04-21 10:46 ` [PATCH v8 12/16] sequencer: handle post-rewrite for merge commands Johannes Schindelin 2018-04-21 10:47 ` [PATCH v8 13/16] rebase --rebase-merges: avoid "empty merges" Johannes Schindelin 2018-04-21 10:49 ` [PATCH v8 14/16] pull: accept --rebase=merges to recreate the branch topology Johannes Schindelin 2018-04-21 10:57 ` [PATCH v8 15/16] rebase -i: introduce --rebase-merges=[no-]rebase-cousins Johannes Schindelin 2018-04-21 11:09 ` [PATCH v8 16/16] rebase -i --rebase-merges: add a section to the man page Johannes Schindelin 2018-04-25 12:28 ` Johannes Schindelin [this message] 2018-04-25 12:28 ` [PATCH v9 01/17] sequencer: avoid using errno clobbered by rollback_lock_file() Johannes Schindelin 2018-04-25 12:28 ` [PATCH v9 02/17] sequencer: make rearrange_squash() a bit more obvious Johannes Schindelin 2018-04-25 12:28 ` [PATCH v9 03/17] sequencer: refactor how original todo list lines are accessed Johannes Schindelin 2018-04-25 12:28 ` [PATCH v9 04/17] sequencer: offer helpful advice when a command was rescheduled Johannes Schindelin 2018-04-25 12:28 ` [PATCH v9 05/17] git-rebase--interactive: clarify arguments Johannes Schindelin 2018-04-25 12:28 ` [PATCH v9 06/17] sequencer: introduce new commands to reset the revision Johannes Schindelin 2018-04-25 12:28 ` [PATCH v9 07/17] sequencer: introduce the `merge` command Johannes Schindelin 2018-04-25 12:28 ` [PATCH v9 08/17] sequencer: fast-forward `merge` commands, if possible Johannes Schindelin 2018-04-25 12:29 ` [PATCH v9 09/17] rebase-helper --make-script: introduce a flag to rebase merges Johannes Schindelin 2018-04-25 12:29 ` [PATCH v9 10/17] rebase: introduce the --rebase-merges option Johannes Schindelin 2018-04-25 12:29 ` [PATCH v9 11/17] rebase --rebase-merges: add test for --keep-empty Johannes Schindelin 2018-04-25 12:29 ` [PATCH v9 12/17] sequencer: make refs generated by the `label` command worktree-local Johannes Schindelin 2018-04-25 12:29 ` [PATCH v9 13/17] sequencer: handle post-rewrite for merge commands Johannes Schindelin 2018-04-25 12:29 ` [PATCH v9 14/17] rebase --rebase-merges: avoid "empty merges" Johannes Schindelin 2018-04-25 12:29 ` [PATCH v9 15/17] pull: accept --rebase=merges to recreate the branch topology Johannes Schindelin 2018-04-25 12:29 ` [PATCH v9 16/17] rebase -i: introduce --rebase-merges=[no-]rebase-cousins Johannes Schindelin 2018-04-25 12:29 ` [PATCH v9 17/17] rebase -i --rebase-merges: add a section to the man page Johannes Schindelin 2018-04-26 3:51 ` [PATCH v9 00/17] rebase -i: offer to recreate commit topology by rebasing merges Junio C Hamano 2018-04-26 6:06 ` Junio C Hamano 2018-05-25 14:19 ` Sergey Organov 2018-05-25 15:44 ` Sergey Organov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=cover.1524659287.git.johannes.schindelin@gmx.de \ --to=johannes.schindelin@gmx.de \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=igor.d.djordjevic@gmail.com \ --cc=j6t@kdbg.org \ --cc=jacob.keller@gmail.com \ --cc=martin.agren@gmail.com \ --cc=philipoakley@iee.org \ --cc=phillip.wood@dunelm.org.uk \ --cc=sbeller@google.com \ --cc=sorganov@gmail.com \ --cc=sunshine@sunshineco.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git