On 3/26/07, Shawn O. Pearce <spearce@xxxxxxxxxxx> wrote:
Geoff Russell <geoffrey.russell@xxxxxxxxx> 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.
Thanks Shawn, but my situation is I have the MASTER repository and I'm
pulling from a TEST repository. I want to double
check the updates other people have done
on the TEST repository, and if they are okay, then commit them.
If --no-commit won't let me do this then perhaps I need something like:
git pull origin:testing
git checkout testing
.... test
git checkout master ; git pull . testing
i.e., make a branch for the test changes and then merge this branch.
Cheers,
Geoff
--
Shawn.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html