On Thu, Jul 17, 2008 at 4:12 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Suppose you are about to finish something you have been cooking (say a > series of five logical commits), you've made three of these commits > already, and what you have in your work tree and the index is to be split > into the last two commits. Somehow you learn that $x above has a updated > version. > > Yes, running "git stash && git pull --rebase && git stash pop" would be > better than running "git pull --rebase" alone from that state. But that > would mean your history would have your first 3 commits (of 5 commit > series), somebody else's totally unrelated commits, and then you will work > on finishing the remaining 2 commits on top of it. Hmm, the first 3 commits are not pushed out, right? So by "rebase", the history should be first the somebody else's commits (origin/master), then the first 3 commits, then the remaining 2 commits?: -- Ping Yin -- 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
