On Wed, Apr 13, 2011 at 3:38 PM, 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), > but I can't quite figure out why. > This is specially important since we need our app servers to have the > same commit hash once git pull is done. > > Anything obvious I'm missing out? Any extra info that can help > pinpoint what the issue is? Maybe you did a git merge instead of a git pull? Does 'gitk --all' show you anything interesting? I find it useful in understanding issues like this. It does sound like a merge happened, without having any more information to go on. -John -- 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