From: "Shawn O. Pearce" <spearce@spearce.org>
To: Geoff Russell <geoffrey.russell@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Question regarding: git pull --no-commit origin
Date: Sun, 25 Mar 2007 19:38:23 -0400 [thread overview]
Message-ID: <20070325233823.GA13247@spearce.org> (raw)
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.
next prev parent reply other threads:[~2007-03-25 23:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-25 23:32 Question regarding: git pull --no-commit origin Geoff Russell
2007-03-25 23:38 ` Shawn O. Pearce [this message]
2007-03-26 1:16 ` Geoff Russell
2007-03-26 1:47 ` Jeff King
2007-03-26 2:17 ` Geoff Russell
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=20070325233823.GA13247@spearce.org \
--to=spearce@spearce.org \
--cc=geoffrey.russell@gmail.com \
--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).