On 1/25/07, Santi Béjar <sbejar@xxxxxxxxx> wrote:
I've tried to separate the fetch and merge logic. At the same time it has removed 40 lines of code to the git-*.sh.
Just some words for the basic idea. git-fetch: fetches the branches from the remote and save this information in .git/FETCH_HEAD. In .git/FETCH_REMOTE it save additional information, as the remote nick, the remote url, the refspec used and the default remote. git-pull: uses this information to select the branches to merge and save them in .git/FETCH_MERGE. See you. Santi - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html