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-script
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 asked
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
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
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
5 matches
Mail list logo
