On Wed, Apr 13, 2011 at 21:38, Arthur Debert <arthur@xxxxxxxxxxxxxx> wrote: > Hi Folks. > > I'm seeing some behavior that my git-fu isn't quite capable of explaining. > > On a local branch the last commit has a hash different than the remote > branch it is tracking from. Nothing has been committed locally and > doing: > $ git diff branch-name origin/branch-name > Comes up empty > git pull also says my branch is already up to date. > > It seems that git pull has generated a bogus commit (a merge commit), git pull is designed to create merge commits, if needed. In your case both branches just have the same content, for whatever reason. You probably want to specify "--ff-only" (only fast-forwards) to all your pulls to achieve what you seem to want. -- 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