All of lore.kernel.org
 help / color / mirror / Atom feed
From: kurt_p_lloyd <kplloyd@alcatel-lucent.com>
To: git@vger.kernel.org
Subject: pull/merge --no-commit
Date: Thu, 07 Jun 2007 00:26:49 -0400	[thread overview]
Message-ID: <46678909.10608@alcatel-lucent.com> (raw)

Hello,
I'm new to git, thought I'd take it for a spin.
Found what seems to me to be a problem,
hoping someone can shed light on it.

I /really/ want --no-commit to work, bit it doesn't seem to:

I run:      git pull --no-commit ssh://<blah blah blah>

then I run: git status

it says:    nothing to commit (working directory clean)

then I run: git log

it shows the commit message from the other user below a
commit sha1, and the change I pulled was indeed merged to
my file.

Does this seem to be a bug, or am I doing something wrong?
BTW, merge --no-commit gives me the same problem.  It merges
fine but does the commit.

I put a 'set -x' in the git-merge shell script (which gets
called by pull) from one of my 'pull' runs, I have the output
if anyone wants it.

-Kurt

             reply	other threads:[~2007-06-07  4:32 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-06-07  4:26 kurt_p_lloyd [this message]
2007-06-07  4:39 ` pull/merge --no-commit kurt_p_lloyd
2007-06-07  5:24 ` Junio C Hamano
2007-06-07 18:31   ` kurt_p_lloyd
2007-06-07 18:58     ` Junio C Hamano
2007-06-07 18:59     ` Kevin Green
2007-06-07 19:12     ` Keith Duthie
2007-06-07 20:32       ` kurt_p_lloyd
2007-06-07 20:43         ` J. Bruce Fields
2007-06-07 20:51         ` Keith Duthie

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=46678909.10608@alcatel-lucent.com \
    --to=kplloyd@alcatel-lucent.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.