On 06/07/07 14:31:25, kurt_p_lloyd wrote: > Junio C Hamano wrote: > > > > > > In this case, because you do not have anything new to add to the > > history (remember, git history is a global DAG -- you and the > > other repository are building it by pushing and pulling), we > > move your HEAD to H (the tip of the branch you are pulling). > > There is no need to create a new merge commit, with or without > > the --no-commit option. This is called "fast forward". > > Except here's the model that I am trying to follow.... > It seems that 'pull' can be partitioned into 3 separate responsibilities: > > 1. Retrieve changes from the remote user's replica (without modifying > any /local/ branches). > 2. Bring changes from "remote" into a local branch (without commit). > 3. Commit. > I'm new to git and trying to pick it up and learn this week!! :) I think what you want is: $ git fetch $ git merge origin/master You want to fetch the remote changes into a separate branch and then probably check the log to see what's changed... Once you're happy, merge the branches. Git will still fast-forward because you haven't made any local changes. --Kevin - 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
