John Keeping j...@keeping.me.uk writes:
Perhaps we shuld do something like this (which passes the test suite):
-- 8 --
diff --git a/git-rebase.sh b/git-rebase.sh
index 06c810b..0c6c5d3 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -544,7 +544,8 @@ if test $fork_point = t
then
On Mon, Jul 07, 2014 at 10:56:23AM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
Perhaps we shuld do something like this (which passes the test suite):
-- 8 --
diff --git a/git-rebase.sh b/git-rebase.sh
index 06c810b..0c6c5d3 100755
--- a/git-rebase.sh
+++
Starting with git 1.9.0, rebase no longer omits local commits that
appear in both the upstream and local branches.
I've bisected this down to commit bb3f458: rebase: fix fork-point with
zero arguments. The attached script reproduces the problem. Reverting
the aforementioned commit fixes the
On Thu, Jul 03, 2014 at 11:14:26AM -0400, Ted Felix wrote:
Starting with git 1.9.0, rebase no longer omits local commits that
appear in both the upstream and local branches.
I've bisected this down to commit bb3f458: rebase: fix fork-point with
zero arguments. The attached script
On Thu, Jul 03, 2014 at 08:09:17PM +0100, John Keeping wrote:
On Thu, Jul 03, 2014 at 11:14:26AM -0400, Ted Felix wrote:
Starting with git 1.9.0, rebase no longer omits local commits that
appear in both the upstream and local branches.
It is the problem that bb3f458 fixes. The change in
5 matches
Mail list logo