Junio C Hamano gits...@pobox.com writes:
Sergey Organov sorga...@gmail.com writes:
A sentence --force has no effect under --preserve-merges mode does
not tell the readers very much, either and leaves them wondering if
it means --preserve-merges mode always rebases every time it is
asked,
Junio C Hamano gits...@pobox.com writes:
Junio C Hamano gits...@pobox.com writes:
[...]
How about doing it this way, perhaps?
Could you please apply this your suggestion, as we seem not to agree
on anything better?
-- 8 --
From: Sergey Organov sorga...@gmail.com
Date: Tue, 12 Aug 2014
Junio C Hamano gits...@pobox.com writes:
Sergey Organov sorga...@gmail.com writes:
A sentence --force has no effect under --preserve-merges mode does
not tell the readers very much, either and leaves them wondering if
it means --preserve-merges mode always rebases every time it is
asked,
Junio C Hamano gits...@pobox.com writes:
Sergey Organov sorga...@gmail.com writes:
... I.e., git must not rebase anything
when Current branch is a descendant of the commit you are rebasing
onto, unless -f is given. Simple, reasonable, straightforward.
It may be simple and straightforward,
Sergey Organov sorga...@gmail.com writes:
(I rarely use preserve-merges myself, so I offhand do not know for
certain).
I wonder, don't you yourself use preserve-merges because you don't care
and just use the default, or because you actually use vanilla
history-flattening feature?
The
Junio C Hamano gits...@pobox.com writes:
Junio C Hamano gits...@pobox.com writes:
So I think the reasoning (i.e. is a descendant is not quite right)
is correct, but the updated text is not quite right. Changing it
further to only the committer timestamps and identities would
change is
Sergey Organov sorga...@gmail.com writes:
...
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 2a93c64..f14100a 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -316,11 +316,8 @@ which makes little sense.
-f::
Junio C Hamano gits...@pobox.com writes:
Sergey Organov sorga...@gmail.com writes:
...
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 2a93c64..f14100a 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -316,11 +316,8 @@ which
Sergey Organov sorga...@gmail.com writes:
A sentence --force has no effect under --preserve-merges mode does
not tell the readers very much, either and leaves them wondering if
it means --preserve-merges mode always rebases every time it is
asked, never noticing 'ah, the history is already in
Junio C Hamano gits...@pobox.com writes:
Junio C Hamano gits...@pobox.com writes:
So I think the reasoning (i.e. is a descendant is not quite right)
is correct, but the updated text is not quite right. Changing it
further to only the committer timestamps and identities would
change is
Sergey Organov sorga...@gmail.com writes:
... I.e., git must not rebase anything
when Current branch is a descendant of the commit you are rebasing
onto, unless -f is given. Simple, reasonable, straightforward.
It may be simple and straightforward, but breaks the use case the
plain vanilla
Sergey Organov sorga...@gmail.com writes:
Previous description of -f option was wrong as git rebase does not
require -f to perform rebase when current branch is a descendant of
the commit you are rebasing onto, provided commit(s) to be rebased
contain merge(s).
Both the above and the updated
Junio C Hamano gits...@pobox.com writes:
So I think the reasoning (i.e. is a descendant is not quite right)
is correct, but the updated text is not quite right. Changing it
further to only the committer timestamps and identities would
change is probably not an improvement, either. Force the
13 matches
Mail list logo
