From: layer <layer@known.net>
To: git@vger.kernel.org
Subject: 1.6.1.3: git merge --no-commit ... DID commit
Date: Wed, 06 Jan 2010 17:41:58 -0800 [thread overview]
Message-ID: <11785.1262828518@relay.known.net> (raw)
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?
next reply other threads:[~2010-01-07 1:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-07 1:41 layer [this message]
2010-01-07 2:13 ` 1.6.1.3: git merge --no-commit ... DID commit Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11785.1262828518@relay.known.net \
--to=layer@known.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.