Le 13/12/13 09:16, Gavin Lambert a écrit :
On 13/12/2013 19:38, Quoth Vicente J. Botet Escriba:
I have tried to pull this PR doing
git pull https://github.com/ccbrown/chrono mac-thread-clock
but when I do
git status
there is nothing on the stage
However I see the merged files
git log thread_clock.hpp commit 143260daeb2703961448a0928d199747ca34dfca Author: ccbrown
Date: Wed Dec 11 21:38:34 2013 -0800 mac thread_clock implementation
commit f5eb279eee0a28bc851abc24c41f293d95a71ba2 Author: Vicente J. Botet Escriba
Date: Wed Jan 5 23:46:58 2011 +0000 Boost.Chrono: Moved to trunk
[SVN r67697]
Could some one explain me what I did wrong?
By default, pull and merge in git will auto-commit if they don't see any conflicts. You can tell them not to by using --no-commit. I don't see the file changes in https://github.com/boostorg/chrono/commits/develop.
Vicente