From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Johannes Sixt" <j6t@kdbg.org>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v9 0/9] rebase: learn --keep-base and improvements on fast-forward behaviour
Date: Sun, 25 Aug 2019 05:11:54 -0400 [thread overview]
Message-ID: <cover.1566724236.git.liu.denton@gmail.com> (raw)
In-Reply-To: <20190508001252.15752-1-avarab@gmail.com>
Hi all, it's been a while but I guess now's a good time as any to
resurrect this topic. This is basically a resubmission of Ævar's WIP v8
but I fixed a couple of minor whitespace issues.
In addition, I opted to drop patches 9-13 from v8 since I don't think I
can do a good enough job polishing them up and I don't really understand
the intricacies of this part of the rebase code. Hopefully, Ævar will
pick them up at a later time.
Changes since v1:
* Squashed old set into one patch
* Fixed indentation style and dangling else
* Added more documentation after discussion with Ævar
Changes since v2:
* Add testing for rebase --fork-point behaviour
* Add testing for rebase fast-forward behaviour
* Make rebase --onto fast-forward in more cases
* Update documentation to include use-case
Changes since v3:
* Fix tests failing on bash 4.2
* Fix typo in t3431 comment
Changes since v4:
* Make rebase --fork-point fast-forward in more cases
Changes since v5:
* Fix graph illustrations so that the "branch off" is visually in the
correct place
* Refactor if-else in can_fast_forward into one-level-deep ifs to
increase clarity
Changes since v6:
* Remove redundant braces around if
* Update comment around can_fast_forward call
* Add completion for rebase
Changes since v7:
* Ævar sent in his WIP patchset
Changes since v8:
* Drop patches 9-13
* Fix some minor whitespace issues from v7
[1]: https://public-inbox.org/git/a1b4b74b9167e279dae4cd8c58fb28d8a714a66a.1553537656.git.gitgitgadget@gmail.com/
Denton Liu (6):
t3431: add rebase --fork-point tests
t3432: test rebase fast-forward behavior
rebase: refactor can_fast_forward into goto tower
rebase: fast-forward --onto in more cases
rebase: fast-forward --fork-point in more cases
rebase: teach rebase --keep-base
Ævar Arnfjörð Bjarmason (3):
t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
t3432: test for --no-ff's interaction with fast-forward
rebase tests: test linear branch topology
Documentation/git-rebase.txt | 30 +++++-
builtin/rebase.c | 85 ++++++++++++-----
contrib/completion/git-completion.bash | 2 +-
t/t3400-rebase.sh | 2 +-
t/t3404-rebase-interactive.sh | 2 +-
t/t3416-rebase-onto-threedots.sh | 57 +++++++++++
t/t3421-rebase-topology-linear.sh | 29 ++++++
t/t3431-rebase-fork-point.sh | 57 +++++++++++
t/t3432-rebase-fast-forward.sh | 125 +++++++++++++++++++++++++
9 files changed, 361 insertions(+), 28 deletions(-)
create mode 100755 t/t3431-rebase-fork-point.sh
create mode 100755 t/t3432-rebase-fast-forward.sh
Range-diff against v8:
1: eb64f6c91d ! 1: 03f769d410 t3431: add rebase --fork-point tests
@@ t/t3431-rebase-fork-point.sh (new)
+ test_commit G
+'
+
-+test_rebase() {
++test_rebase () {
+ expected="$1" &&
+ shift &&
+ test_expect_success "git rebase $*" "
2: 4c087ec041 ! 2: bc8998079d t3432: test rebase fast-forward behavior
@@ t/t3432-rebase-fast-forward.sh (new)
+ git checkout -t -b side
+'
+
-+test_rebase_same_head() {
++test_rebase_same_head () {
+ status="$1" &&
+ shift &&
+ test_expect_$status "git rebase $* with $changes is no-op" "
-: ---------- > 3: 5c08e2b81f t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
-: ---------- > 4: 48b4e41a17 t3432: test for --no-ff's interaction with fast-forward
3: 3d348d2c37 = 5: 9bd34b4a40 rebase: refactor can_fast_forward into goto tower
4: 27cbcfaeae ! 6: becb924232 rebase: fast-forward --onto in more cases
@@ Commit message
Add '-f' to test cases that failed as a result of this change because
they were not expecting a fast-forward so that a rebase is forced.
- While we're at it, remove a trailing whitespace from rebase.c.
-
Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Denton Liu <liu.denton@gmail.com>
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix
int flag;
if (!(options.flags & REBASE_FORCE)) {
-@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix)
- strbuf_addf(&msg, "%s: checkout %s",
- getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name);
- if (reset_head(&options.onto->object.oid, "checkout", NULL,
-- RESET_HEAD_DETACH | RESET_ORIG_HEAD |
-+ RESET_HEAD_DETACH | RESET_ORIG_HEAD |
- RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
- NULL, msg.buf))
- die(_("Could not detach HEAD"));
## t/t3400-rebase.sh ##
-@@ t/t3400-rebase.sh: test_expect_success 'rebase--am.sh and --show-current-patch' '
+@@ t/t3400-rebase.sh: test_expect_success 'rebase --am and --show-current-patch' '
echo two >>init.t &&
git commit -a -m two &&
git tag two &&
@@ t/t3404-rebase-interactive.sh: test_expect_success C_LOCALE_OUTPUT 'rebase --edi
'
## t/t3432-rebase-fast-forward.sh ##
-@@ t/t3432-rebase-fast-forward.sh: test_expect_success 'add work to upstream' '
+@@ t/t3432-rebase-fast-forward.sh: test_expect_success 'add work same to upstream' '
changes='our and their changes'
- test_rebase_same_head success --onto B B
- test_rebase_same_head success --onto B... B
--test_rebase_same_head failure --onto master... master
-+test_rebase_same_head success --onto master... master
- test_rebase_same_head failure --fork-point --onto B B
- test_rebase_same_head failure --fork-point --onto B... B
--test_rebase_same_head failure --fork-point --onto master... master
-+test_rebase_same_head success --fork-point --onto master... master
+ test_rebase_same_head success noop same success noop-force diff --onto B B
+ test_rebase_same_head success noop same success noop-force diff --onto B... B
+-test_rebase_same_head failure work same success work diff --onto master... master
++test_rebase_same_head success noop same success work diff --onto master... master
+ test_rebase_same_head failure work same success work diff --fork-point --onto B B
+ test_rebase_same_head failure work same success work diff --fork-point --onto B... B
+-test_rebase_same_head failure work same success work diff --fork-point --onto master... master
++test_rebase_same_head success noop same success work diff --fork-point --onto master... master
test_done
5: 8254730810 ! 7: 4dab5847cb rebase: fast-forward --fork-point in more cases
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix
if (!(options.flags & REBASE_FORCE)) {
## t/t3432-rebase-fast-forward.sh ##
-@@ t/t3432-rebase-fast-forward.sh: test_rebase_same_head success --onto B... B
- test_rebase_same_head success --onto master... master
- test_rebase_same_head success --no-fork-point
- test_rebase_same_head success --fork-point master
--test_rebase_same_head failure --fork-point --onto B B
--test_rebase_same_head failure --fork-point --onto B... B
-+test_rebase_same_head success --fork-point --onto B B
-+test_rebase_same_head success --fork-point --onto B... B
- test_rebase_same_head success --fork-point --onto master... master
+@@ t/t3432-rebase-fast-forward.sh: test_rebase_same_head_ () {
+ }
+
+ changes='no changes'
+-test_rebase_same_head success work same success work same
++test_rebase_same_head success noop same success work same
+ test_rebase_same_head success noop same success noop-force same master
+ test_rebase_same_head success noop same success noop-force diff --onto B B
+ test_rebase_same_head success noop same success noop-force diff --onto B... B
+ test_rebase_same_head success noop same success noop-force same --onto master... master
+ test_rebase_same_head success noop same success noop-force same --no-fork-point
+-test_rebase_same_head success work same success work same --fork-point master
+-test_rebase_same_head failure noop same success work diff --fork-point --onto B B
+-test_rebase_same_head failure work same success work diff --fork-point --onto B... B
+-test_rebase_same_head success work same success work same --fork-point --onto master... master
++test_rebase_same_head success noop same success work same --fork-point master
++test_rebase_same_head success noop same success work diff --fork-point --onto B B
++test_rebase_same_head success noop same success work diff --fork-point --onto B... B
++test_rebase_same_head success noop same success work same --fork-point --onto master... master
- test_expect_success 'add work to side' '
-@@ t/t3432-rebase-fast-forward.sh: test_rebase_same_head success --onto B... B
- test_rebase_same_head success --onto master... master
- test_rebase_same_head success --no-fork-point
- test_rebase_same_head success --fork-point master
--test_rebase_same_head failure --fork-point --onto B B
--test_rebase_same_head failure --fork-point --onto B... B
-+test_rebase_same_head success --fork-point --onto B B
-+test_rebase_same_head success --fork-point --onto B... B
- test_rebase_same_head success --fork-point --onto master... master
+ test_expect_success 'add work same to side' '
+ test_commit E
+ '
- test_expect_success 'add work to upstream' '
-@@ t/t3432-rebase-fast-forward.sh: changes='our and their changes'
- test_rebase_same_head success --onto B B
- test_rebase_same_head success --onto B... B
- test_rebase_same_head success --onto master... master
--test_rebase_same_head failure --fork-point --onto B B
--test_rebase_same_head failure --fork-point --onto B... B
-+test_rebase_same_head success --fork-point --onto B B
-+test_rebase_same_head success --fork-point --onto B... B
- test_rebase_same_head success --fork-point --onto master... master
+ changes='our changes'
+-test_rebase_same_head success work same success work same
++test_rebase_same_head success noop same success work same
+ test_rebase_same_head success noop same success noop-force same master
+ test_rebase_same_head success noop same success noop-force diff --onto B B
+ test_rebase_same_head success noop same success noop-force diff --onto B... B
+ test_rebase_same_head success noop same success noop-force same --onto master... master
+ test_rebase_same_head success noop same success noop-force same --no-fork-point
+-test_rebase_same_head success work same success work same --fork-point master
+-test_rebase_same_head failure work same success work diff --fork-point --onto B B
+-test_rebase_same_head failure work same success work diff --fork-point --onto B... B
+-test_rebase_same_head success work same success work same --fork-point --onto master... master
++test_rebase_same_head success noop same success work same --fork-point master
++test_rebase_same_head success noop same success work diff --fork-point --onto B B
++test_rebase_same_head success noop same success work diff --fork-point --onto B... B
++test_rebase_same_head success noop same success work same --fork-point --onto master... master
- test_done
+ test_expect_success 'add work same to upstream' '
+ git checkout master &&
-: ---------- > 8: 4699a90993 rebase tests: test linear branch topology
6: f18d3ee3fa ! 9: 6927aba617 rebase: teach rebase --keep-base
@@ Commit message
in order to preserve the merge base. This is useful when contributing a
patch series to the Git mailing list, one often starts on top of the
current 'master'. However, while developing the patches, 'master' is
- also developed further and it is sometimes not the bst idea to keep
+ also developed further and it is sometimes not the best idea to keep
rebasing on top of 'master', but to keep the base commit as-is.
Alternatively, a user wishing to test individual commits in a topic
@@ Documentation/git-rebase.txt: git-rebase - Reapply commits on top of another bas
+ [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]
--root [<branch>]
- 'git rebase' --continue | --skip | --abort | --quit | --edit-todo | --show-current-patch
+ 'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)
@@ Documentation/git-rebase.txt: As a special case, you may use "A\...B" as a shortcut for the
merge base of A and B if there is exactly one merge base. You can
leave out at most one of A and B, in which case it defaults to HEAD.
@@ Documentation/git-rebase.txt: NOTE: While an "easy case recovery" sometimes appe
## builtin/rebase.c ##
@@
- #include "branch.h"
+ #include "rebase-interactive.h"
static char const * const builtin_rebase_usage[] = {
- N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "
@@ builtin/rebase.c
"--root [<branch>]"),
N_("git rebase --continue | --abort | --skip | --edit-todo"),
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix)
- };
+ struct rebase_options options = REBASE_OPTIONS_INIT;
const char *branch_name;
int ret, flags, total_argc, in_progress = 0;
+ int keep_base = 0;
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix
N_("allow pre-rebase hook to run")),
OPT_NEGBIT('q', "quiet", &options.flags,
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix)
- usage_with_options(builtin_rebase_usage,
- builtin_rebase_options);
+ warning(_("git rebase --preserve-merges is deprecated. "
+ "Use --rebase-merges instead."));
+ if (keep_base) {
+ if (options.onto_name)
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix
+ die(_("cannot combine '--keep-base' with '--root'"));
+ }
+
- if (action != NO_ACTION && !in_progress)
+ if (action != ACTION_NONE && !in_progress)
die(_("No rebase in progress?"));
setenv(GIT_REFLOG_ACTION_ENVIRONMENT, "rebase", 0);
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix)
@@ t/t3416-rebase-onto-threedots.sh: test_expect_success 'rebase -i --onto master..
test_done
## t/t3431-rebase-fork-point.sh ##
-@@ t/t3431-rebase-fork-point.sh: test_rebase() {
+@@ t/t3431-rebase-fork-point.sh: test_rebase () {
test_rebase 'G F E D B A'
test_rebase 'G F D B A' --onto D
@@ t/t3431-rebase-fork-point.sh: test_rebase() {
test_done
## t/t3432-rebase-fast-forward.sh ##
-@@ t/t3432-rebase-fast-forward.sh: test_rebase_same_head success master
- test_rebase_same_head success --onto B B
- test_rebase_same_head success --onto B... B
- test_rebase_same_head success --onto master... master
-+test_rebase_same_head success --keep-base master
-+test_rebase_same_head success --keep-base
- test_rebase_same_head success --no-fork-point
-+test_rebase_same_head success --keep-base --no-fork-point
- test_rebase_same_head success --fork-point master
- test_rebase_same_head success --fork-point --onto B B
- test_rebase_same_head success --fork-point --onto B... B
- test_rebase_same_head success --fork-point --onto master... master
-+test_rebase_same_head success --fork-point --keep-base master
+@@ t/t3432-rebase-fast-forward.sh: test_rebase_same_head success noop same success noop-force same master
+ test_rebase_same_head success noop same success noop-force diff --onto B B
+ test_rebase_same_head success noop same success noop-force diff --onto B... B
+ test_rebase_same_head success noop same success noop-force same --onto master... master
++test_rebase_same_head success noop same success noop-force same --keep-base master
++test_rebase_same_head success noop same success noop-force same --keep-base
+ test_rebase_same_head success noop same success noop-force same --no-fork-point
++test_rebase_same_head success noop same success noop-force same --keep-base --no-fork-point
+ test_rebase_same_head success noop same success work same --fork-point master
+ test_rebase_same_head success noop same success work diff --fork-point --onto B B
+ test_rebase_same_head success noop same success work diff --fork-point --onto B... B
+ test_rebase_same_head success noop same success work same --fork-point --onto master... master
++test_rebase_same_head success noop same success work same --keep-base --keep-base master
- test_expect_success 'add work to side' '
+ test_expect_success 'add work same to side' '
test_commit E
-@@ t/t3432-rebase-fast-forward.sh: test_rebase_same_head success master
- test_rebase_same_head success --onto B B
- test_rebase_same_head success --onto B... B
- test_rebase_same_head success --onto master... master
-+test_rebase_same_head success --keep-base master
-+test_rebase_same_head success --keep-base
- test_rebase_same_head success --no-fork-point
-+test_rebase_same_head success --keep-base --no-fork-point
- test_rebase_same_head success --fork-point master
- test_rebase_same_head success --fork-point --onto B B
- test_rebase_same_head success --fork-point --onto B... B
- test_rebase_same_head success --fork-point --onto master... master
-+test_rebase_same_head success --fork-point --keep-base master
+@@ t/t3432-rebase-fast-forward.sh: test_rebase_same_head success noop same success noop-force same master
+ test_rebase_same_head success noop same success noop-force diff --onto B B
+ test_rebase_same_head success noop same success noop-force diff --onto B... B
+ test_rebase_same_head success noop same success noop-force same --onto master... master
++test_rebase_same_head success noop same success noop-force same --keep-base master
++test_rebase_same_head success noop same success noop-force same --keep-base
+ test_rebase_same_head success noop same success noop-force same --no-fork-point
++test_rebase_same_head success noop same success noop-force same --keep-base --no-fork-point
+ test_rebase_same_head success noop same success work same --fork-point master
+ test_rebase_same_head success noop same success work diff --fork-point --onto B B
+ test_rebase_same_head success noop same success work diff --fork-point --onto B... B
+ test_rebase_same_head success noop same success work same --fork-point --onto master... master
++test_rebase_same_head success noop same success work same --fork-point --keep-base master
- test_expect_success 'add work to upstream' '
+ test_expect_success 'add work same to upstream' '
git checkout master &&
@@ t/t3432-rebase-fast-forward.sh: changes='our and their changes'
- test_rebase_same_head success --onto B B
- test_rebase_same_head success --onto B... B
- test_rebase_same_head success --onto master... master
-+test_rebase_same_head success --keep-base master
-+test_rebase_same_head success --keep-base
- test_rebase_same_head success --fork-point --onto B B
- test_rebase_same_head success --fork-point --onto B... B
- test_rebase_same_head success --fork-point --onto master... master
-+test_rebase_same_head success --fork-point --keep-base master
+ test_rebase_same_head success noop same success noop-force diff --onto B B
+ test_rebase_same_head success noop same success noop-force diff --onto B... B
+ test_rebase_same_head success noop same success work diff --onto master... master
++test_rebase_same_head success noop same success work diff --keep-base master
++test_rebase_same_head success noop same success work diff --keep-base
+ test_rebase_same_head failure work same success work diff --fork-point --onto B B
+ test_rebase_same_head failure work same success work diff --fork-point --onto B... B
+ test_rebase_same_head success noop same success work diff --fork-point --onto master... master
++test_rebase_same_head success noop same success work diff --fork-point --keep-base master
test_done
--
2.23.0.248.g3a9dd8fb08
next prev parent reply other threads:[~2019-08-25 9:12 UTC|newest]
Thread overview: 123+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-23 15:25 [PATCH 0/3] rebase: learn --keep-base Denton Liu
2019-03-23 15:25 ` [PATCH 1/3] rebase: teach rebase --keep-base Denton Liu
2019-03-24 3:46 ` Eric Sunshine
2019-03-24 13:20 ` Junio C Hamano
2019-03-25 0:06 ` Denton Liu
2019-03-25 5:41 ` Denton Liu
2019-04-01 10:45 ` Junio C Hamano
2019-03-24 13:37 ` Junio C Hamano
2019-03-25 5:47 ` Denton Liu
2019-03-25 18:50 ` Johannes Schindelin
2019-03-25 19:29 ` Denton Liu
2019-03-26 13:27 ` Johannes Schindelin
2019-03-23 15:25 ` [PATCH 2/3] t3416: test " Denton Liu
2019-03-23 15:25 ` [PATCH 3/3] git-rebase.txt: document --keep-base option Denton Liu
2019-03-24 13:15 ` [PATCH 0/3] rebase: learn --keep-base Junio C Hamano
2019-03-25 0:04 ` Denton Liu
2019-04-01 10:45 ` Junio C Hamano
2019-03-26 14:35 ` Ævar Arnfjörð Bjarmason
2019-03-26 17:50 ` Denton Liu
2019-03-26 20:35 ` Ævar Arnfjörð Bjarmason
2019-03-26 21:30 ` Denton Liu
2019-03-27 15:39 ` Ævar Arnfjörð Bjarmason
2019-03-28 22:17 ` [PATCH v2] rebase: teach rebase --keep-base Denton Liu
2019-03-28 23:13 ` Ævar Arnfjörð Bjarmason
2019-03-29 15:47 ` Johannes Schindelin
2019-03-29 17:52 ` Denton Liu
2019-04-01 10:46 ` Junio C Hamano
2019-04-01 20:51 ` [PATCH v3 0/4] " Denton Liu
2019-04-01 20:51 ` [PATCH v3 1/4] t3431: add rebase --fork-point tests Denton Liu
2019-04-04 20:28 ` Denton Liu
2019-04-05 11:15 ` SZEDER Gábor
2019-04-08 4:38 ` Junio C Hamano
2019-04-05 14:55 ` Johannes Schindelin
2019-04-05 17:25 ` Denton Liu
2019-04-05 17:51 ` Johannes Sixt
2019-04-05 18:51 ` Johannes Schindelin
2019-04-05 20:19 ` Johannes Schindelin
2019-04-05 21:10 ` SZEDER Gábor
2019-04-01 20:51 ` [PATCH v3 2/4] t3432: test rebase fast-forward behavior Denton Liu
2019-04-01 20:52 ` [PATCH v3 3/4] rebase: fast-forward --onto in more cases Denton Liu
2019-04-02 1:25 ` Junio C Hamano
2019-04-02 1:48 ` Junio C Hamano
2019-04-02 4:44 ` Denton Liu
2019-04-01 20:52 ` [PATCH v3 4/4] rebase: teach rebase --keep-base Denton Liu
2019-04-05 21:39 ` [PATCH v4 0/4] " Denton Liu
2019-04-05 21:40 ` [PATCH v4 1/4] t3431: add rebase --fork-point tests Denton Liu
2019-04-05 21:40 ` [PATCH v4 2/4] t3432: test rebase fast-forward behavior Denton Liu
2019-04-05 21:40 ` [PATCH v4 3/4] rebase: fast-forward --onto in more cases Denton Liu
2019-04-05 21:40 ` [PATCH v4 4/4] rebase: teach rebase --keep-base Denton Liu
2019-04-15 22:29 ` [PATCH v5 0/5] " Denton Liu
2019-04-15 22:29 ` [PATCH v5 1/5] t3431: add rebase --fork-point tests Denton Liu
2019-04-15 22:29 ` [PATCH v5 2/5] t3432: test rebase fast-forward behavior Denton Liu
2019-04-15 22:29 ` [PATCH v5 3/5] rebase: fast-forward --onto in more cases Denton Liu
2019-04-16 6:26 ` Junio C Hamano
2019-04-16 13:59 ` Phillip Wood
2019-04-17 6:44 ` Denton Liu
2019-04-17 14:14 ` Phillip Wood
2019-04-19 17:08 ` Denton Liu
2019-04-15 22:29 ` [PATCH v5 4/5] rebase: fast-forward --fork-point " Denton Liu
2019-04-15 22:29 ` [PATCH v5 5/5] rebase: teach rebase --keep-base Denton Liu
2019-04-17 18:01 ` [PATCH v6 0/5] " Denton Liu
2019-04-17 18:01 ` [PATCH v6 1/6] t3431: add rebase --fork-point tests Denton Liu
2019-04-17 18:01 ` [PATCH v6 2/6] t3432: test rebase fast-forward behavior Denton Liu
2019-04-17 18:01 ` [PATCH v6 3/6] rebase: refactor can_fast_forward into goto tower Denton Liu
2019-04-17 18:01 ` [PATCH v6 4/6] rebase: fast-forward --onto in more cases Denton Liu
2019-04-17 19:59 ` Phillip Wood
2019-04-17 18:01 ` [PATCH v6 5/6] rebase: fast-forward --fork-point " Denton Liu
2019-04-17 18:01 ` [PATCH v6 6/6] rebase: teach rebase --keep-base Denton Liu
2019-04-21 8:11 ` [PATCH v7 0/6] rebase: learn --keep-base Denton Liu
2019-04-21 8:11 ` [PATCH v7 1/6] t3431: add rebase --fork-point tests Denton Liu
2019-04-23 23:12 ` Denton Liu
2019-04-21 8:11 ` [PATCH v7 2/6] t3432: test rebase fast-forward behavior Denton Liu
2019-04-21 8:11 ` [PATCH v7 3/6] rebase: refactor can_fast_forward into goto tower Denton Liu
2019-04-21 8:11 ` [PATCH v7 4/6] rebase: fast-forward --onto in more cases Denton Liu
2019-04-21 8:11 ` [PATCH v7 5/6] rebase: fast-forward --fork-point " Denton Liu
2019-04-21 8:11 ` [PATCH v7 6/6] rebase: teach rebase --keep-base Denton Liu
2019-05-08 0:12 ` [RFC WIP PATCH v8 00/13] learn --keep-base & more Ævar Arnfjörð Bjarmason
2019-05-08 3:57 ` Junio C Hamano
2019-07-19 19:14 ` Junio C Hamano
2019-07-19 21:01 ` Denton Liu
2019-08-25 9:11 ` Denton Liu [this message]
2019-08-25 9:11 ` [PATCH v9 1/9] t3431: add rebase --fork-point tests Denton Liu
2019-08-25 9:12 ` [PATCH v9 2/9] t3432: test rebase fast-forward behavior Denton Liu
2019-08-25 9:12 ` [PATCH v9 3/9] t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests Denton Liu
2019-08-25 9:12 ` [PATCH v9 4/9] t3432: test for --no-ff's interaction with fast-forward Denton Liu
2019-08-25 9:12 ` [PATCH v9 5/9] rebase: refactor can_fast_forward into goto tower Denton Liu
2019-08-25 13:17 ` Pratyush Yadav
2019-08-26 23:17 ` Denton Liu
2019-08-25 9:12 ` [PATCH v9 6/9] rebase: fast-forward --onto in more cases Denton Liu
2019-08-25 9:12 ` [PATCH v9 7/9] rebase: fast-forward --fork-point " Denton Liu
2019-08-25 9:12 ` [PATCH v9 8/9] rebase tests: test linear branch topology Denton Liu
2019-08-25 9:12 ` [PATCH v9 9/9] rebase: teach rebase --keep-base Denton Liu
2019-08-25 22:59 ` Philip Oakley
2019-08-26 19:37 ` [PATCH v9 0/9] rebase: learn --keep-base and improvements on fast-forward behaviour Junio C Hamano
2019-08-27 5:37 ` [PATCH v10 " Denton Liu
2019-08-27 5:37 ` [PATCH v10 1/9] t3431: add rebase --fork-point tests Denton Liu
2019-08-27 5:37 ` [PATCH v10 2/9] t3432: test rebase fast-forward behavior Denton Liu
2019-08-27 5:37 ` [PATCH v10 3/9] t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests Denton Liu
2019-08-27 5:37 ` [PATCH v10 4/9] t3432: test for --no-ff's interaction with fast-forward Denton Liu
2019-08-27 8:11 ` SZEDER Gábor
2019-08-27 5:37 ` [PATCH v10 5/9] rebase: refactor can_fast_forward into goto tower Denton Liu
2019-08-27 5:37 ` [PATCH v10 6/9] rebase: fast-forward --onto in more cases Denton Liu
2019-08-27 5:38 ` [PATCH v10 7/9] rebase: fast-forward --fork-point " Denton Liu
2019-08-27 5:38 ` [PATCH v10 8/9] rebase tests: test linear branch topology Denton Liu
2019-08-27 5:38 ` [PATCH v10 9/9] rebase: teach rebase --keep-base Denton Liu
2019-05-08 0:12 ` [RFC WIP PATCH v8 01/13] t3431: add rebase --fork-point tests Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 02/13] t3432: test rebase fast-forward behavior Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 03/13] t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 04/13] t3432: test for --no-ff's interaction with fast-forward Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 05/13] rebase: refactor can_fast_forward into goto tower Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 06/13] rebase: fast-forward --onto in more cases Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 07/13] rebase: fast-forward --fork-point " Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 08/13] rebase: teach rebase --keep-base Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 09/13] rebase tests: test linear branch topology Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 10/13] rebase: don't rebase linear topology with --fork-point Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 11/13] rebase: eliminate side-effects from can_fast_forward() Ævar Arnfjörð Bjarmason
2019-05-17 21:16 ` Johannes Schindelin
2019-05-08 0:12 ` [RFC WIP PATCH v8 12/13] rebase: add a should_fast_forward() utility function Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 13/13] WIP: can_fast_forward() support for --preserve-merges and --rebase-merges Ævar Arnfjörð Bjarmason
2019-05-17 22:02 ` Johannes Schindelin
2019-04-06 19:44 ` [PATCH v3 0/4] rebase: teach rebase --keep-base Ævar Arnfjörð Bjarmason
2019-04-06 20:38 ` Denton Liu
2019-04-13 21:10 ` Ævar Arnfjörð Bjarmason
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.1566724236.git.liu.denton@gmail.com \
--to=liu.denton@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@gmail.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).