Geoff Russell [off-list ref] 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.