From: Shawn O. Pearce <spearce@spearce.org>
Date: Sun, 25 Mar 2007 23:38:23 GMT
Subject: Re: Question regarding: git pull --no-commit origin
Message-ID: <20070325233823.GA13247@spearce.org>
In-Reply-To: <93c3eada0703251632s3be48b60na03728ce72b8ab8c@mail.gmail.com>

Geoff Russell <geoffrey.russell@gmail.com> wrote:
> I do: git pull --no-commit origin
> 
> Receive messages ending in:
> 
>        ...
>       Updating 6a29cdd..b7ba33d
>       Fast forward
>       interface/testfile |    1 +
>       1 files changed, 1 insertions(+), 0 deletions(-)
>       create mode 100644 interface/testfile
...
> However when I do: git commit -a
> 
> I'm told: nothing to commit (working directory clean)
> 
> Am I misunderstanding something?

The pull was strictly a fast-forward.  No merge commit was necessary
to record the merge, so we didn't actually honor the --no-commit
argument.

In other words, your current branch did not contain any commits
that were not in the origin branch you were pulling from.  So
a real merge wasn't required here.

-- 
Shawn.