Luke Lu <git@xxxxxxxxxx> writes: > Anyway, I've been using git for only a few months. There might/must > be better ways to do it. As a user coming from cvs and svn, it seems > to me that the most confusing command is actually "git pull" as it > doesn't work with such workflow at all (conflicts with confusing > messages, until you really understand the implications of rebase). It > seems to me that if we create a new "git update" command which is > essentially "git fetch && git rebase <remotebranch>", it would > greatly alleviate such confusions. Some lessons learned from the > short experience: > > 1. commit first, ask question later. > 2. rebase is the new update > 3. reset --hard and reflog are your friends. I don't remember if it would be in coming 1.5.4 release, but there is "git pull --rebase", which means fetch + rebase instead of default fetch + merge. HTH -- Jakub Narebski Poland ShadeHawk on #git - 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
