On Jan 19, 2008 4:22 PM, Ping Yin <pkufranky@xxxxxxxxx> wrote: > I often encounter the case that the origin reposotory is rebased and i > make sure i want to use the origin head as my master > Now I have to do > $ git fetch origin && git reset --hard origin/master Use "git pull origin", which will do the fetch, and then merge it. If you haven't made local changes, the merge will be a fast-forward and so will get you an equivalent result. Dave. - 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
