1.6.1.3: git merge --no-commit ... DID commit
From: layer <hidden>
Date: 2016-06-15 22:47:58
quadra% git merge --no-commit duane-acl82/acl82 Updating 621f935..a94f7fc Fast forward ChangeLog | 23 ++++++++++++++ src/c/fio.c | 2 +- src/c/mon1.c | 6 ++- src/code/debug.cl | 10 +++++- src/code/lldb.cl | 75 +++++++++++++++++++++++++++++++++++++--------- src/code/osi-alpha.cl | 33 ++++++++++++++++++++ src/code/osi-alpha64.cl | 33 ++++++++++++++++++++ src/code/x/disx86-64.cl | 4 ++ src/rs/vrlinux.cl | 3 +- src/rs/xrlinux64.cl | 30 +++++++++++++++---- src/rs/xrmacosx64.cl | 44 ++++++++++++++++++++++++---- src/rs/xrms64.cl | 28 ++++++++++++++--- src/rs/xrsol64.cl | 28 ++++++++++++++--- 13 files changed, 276 insertions(+), 43 deletions(-) quadra% git status # On branch acl82 # Your branch is ahead of 'origin/acl82' by 2 commits. # nothing to commit (working directory clean) quadra% Has this been fixed in a later version?