Catalin Marinas <[EMAIL PROTECTED]> writes:
> If you plan to implement multiple values in FETCH_HEAD, StGIT won't be
> able to use this since it doesn't do any merging for the base of the
> stack. As I said above, this is not a problem and I was probably wrong
> when decided to use git-fetch-scrip
Junio C Hamano <[EMAIL PROTECTED]> wrote:
> If you are happy then I should not complain ;-), and I am
> certainly not complaining, but I still have this feeling that I
> do not get what you are getting at. You can change it to
> directly use pull without intermediate fetch, in order to cope
> with
Catalin Marinas <[EMAIL PROTECTED]> writes:
> OK, I wasn't that clear. Currently git-fetch-script stores the fetched
> head in the FETCH_HEAD file and git-pull-script uses this file to do
> the merging (by passing its content to git-resolve-script).
Correct. I was not planning to change that arr
Junio C Hamano <[EMAIL PROTECTED]> wrote:
> Catalin Marinas <[EMAIL PROTECTED]> writes:
>> Is FETCH_HEAD going to be preserved by the git-fetch-script operation?
>> It should be, unless, git-pull-script removes it or it is changed to
>> do the fetch as well.
>
> I am not quite sure what is being as
Catalin Marinas <[EMAIL PROTECTED]> writes:
> gitk ORIG_HEAD..FETCH_HEAD
Yeah, Linus immediately corrected me when I said ORIG_HEAD
seemed useless.
> Is FETCH_HEAD going to be preserved by the git-fetch-script operation?
> It should be, unless, git-pull-script removes it or it is changed to
>
Junio C Hamano <[EMAIL PROTECTED]> wrote:
> Here is my understanding of various "temporary heads" left
> directly underneath $GIT_DIR:
>
> HEAD : updated only after successful auto merge.
>
> ORIG_HEAD : records the head value before resolve started.
> if automerge fail
On Sun, 7 Aug 2005, Junio C Hamano wrote:
>
> How about LAST_MERGE?
I don't think it matters. I kind of saw it as the "other side" of
ORIG_HEAD, but since we now clean it up and since I've never used it, I
think it falls under the status of "well-intentioned but useless".
Lin
Linus Torvalds <[EMAIL PROTECTED]> writes:
> In fact, ORIG_HEAD is _the_ most common head I use explicitly.
A. You are right.
How about LAST_MERGE?
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://
On Sun, 7 Aug 2005, Junio C Hamano wrote:
>
> Also ORIG_HEAD is probably redundant. After a successful
> automerge, the same information can be had by HEAD^1
Absolutely not.
You forgot about one of the most common merge cases: fast-forward.
In fact, ORIG_HEAD is _the_ most common head I use
9 matches
Mail list logo
