John Keeping writes:
> OK - given this reasoning I agree that --fork-point makes sense.
>
> I think this would have been clearer if the short description said
> something like:
>
> Find the point at which a branch forked from another branch; this
> does not just look for the common ancest
On Mon, Oct 28, 2013 at 12:13:22PM -0700, Junio C Hamano wrote:
> John Keeping writes:
>
> > The --reflog name has the advantage that it makes clear that this is
> > looking at something more than the commit graph and I don't think
> > --fork-point does imply that.
>
> I think I understand what
John Keeping writes:
> The --reflog name has the advantage that it makes clear that this is
> looking at something more than the commit graph and I don't think
> --fork-point does imply that.
I think I understand what you are saying, but that "more than the
commit graph" part in your reasoning i
Martin von Zweigbergk writes:
>> + bases = get_merge_bases_many(derived, revs.nr, revs.commit, 0);
>> + ...
>> + if (revs.nr <= i)
>> + return 1; /* not found */
>> +
>> + printf("%s\n", sha1_to_hex(bases->item->object.sha1));
>> + free_commit_list(bases);
>>
On Fri, Oct 25, 2013 at 02:38:08PM -0700, Junio C Hamano wrote:
> It also comes with a documentation update. The option is not called
> --reflog but --fork-point; naming a feature after what it does
> (i.e. it finds the fork point) is a lot more sensible than naming
> it after how it happens to
Thanks for taking care of this! Maybe John or I can finally get the
changes to rebase done after this.
A few comments below. Sorry I didn't find time to review the earlier revisions.
On Fri, Oct 25, 2013 at 2:38 PM, Junio C Hamano wrote:
> +
> +where `origin/master` used to point at commits B3,
On Fri, Oct 25, 2013 at 5:38 PM, Junio C Hamano wrote:
> diff --git a/Documentation/git-merge-base.txt
> b/Documentation/git-merge-base.txt
> index 87842e3..b383766 100644
> --- a/Documentation/git-merge-base.txt
> +++ b/Documentation/git-merge-base.txt
> @@ -137,6 +143,31 @@ In modern git, you c
The "git pull --rebase" command computes the fork point of the
branch being rebased using the reflog entries of the "base" branch
(typically a remote-tracking branch) the branch's work was based on,
in order to cope with the case in which the "base" branch has been
rewound and rebuilt. For example
8 matches
Mail list logo
