Graham Wilson wrote:
On Sat, Jun 21, 2008 at 04:08:51PM +0200, Stefan Richter wrote:
trying "git pull --no-commit . foo" for the first time, I was confused
that --no-commit was a no-op when the pull resulted in a fast-forward.
I.e. HEAD advanced the whole chain of commits to foo. I expected it to
apply the diff of HEAD..foo but not commit them.
--no-commit to me seems to mean don't commit a merge commit. Maybe what
you want is something like:
git-diff HEAD foo | git-apply
Yes, I obviously got the wrong idea about git-pull --no-commit.
git-diff + git-apply indeed accomplishes what I wanted to do. Thanks,
--
Stefan Richter
-=====-==--- -==- =-==-
http://arcgraph.de/sr/
--
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
