From: Alex Riesen <raa.lkml@gmail.com>
To: Arthur Debert <arthur@stimuli.com.br>
Cc: Git mailing list <git@vger.kernel.org>
Subject: Re: Commit hashes differ from local and remote
Date: Fri, 15 Apr 2011 17:26:01 +0200 [thread overview]
Message-ID: <BANLkTinEJkLbZRc+=wMUaBRKq=xpxYhk3Q@mail.gmail.com> (raw)
In-Reply-To: <BANLkTimhx1tN7EzU94bpKK64P1F8P7MG0g@mail.gmail.com>
On Wed, Apr 13, 2011 at 21:38, Arthur Debert <arthur@stimuli.com.br> 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.
next prev parent reply other threads:[~2011-04-15 15:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-13 19:38 Commit hashes differ from local and remote Arthur Debert
2011-04-15 1:46 ` John Szakmeister
2011-04-15 15:26 ` Alex Riesen [this message]
2011-04-15 15:41 ` Arthur Debert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='BANLkTinEJkLbZRc+=wMUaBRKq=xpxYhk3Q@mail.gmail.com' \
--to=raa.lkml@gmail.com \
--cc=arthur@stimuli.com.br \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).