Re: pull/merge --no-commit
PS - Sorry, I should have mentioned the git version: 1.5.2.1
kurt_p_lloyd wrote:
Show 28 quoted lines
> 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