From: "Brian L. Troutwine" <goofyheadedpunk@gmail.com>
To: git@vger.kernel.org
Subject: The --no-commit blues
Date: Mon, 18 Jun 2007 08:06:26 -0700 [thread overview]
Message-ID: <200706180806.26255.goofyheadedpunk@gmail.com> (raw)
I've got two branches, one which I commit to quite frequently and another only
periodically, call them inward and outward. Inward is where I do my work,
outward tracks an SVN repository. I'd like to merge inward to outward without
committing the merge so that I may provide a commit message appropriate for
checking in to the SVN repo.
`git merge --no-commit inward' from branch outward, I thought, should do it.
Performing a `git status' and a `git log' directly afterward seem to indicate
that the merge was committed. `git commit' insists the branch is now up to
date.
Am I going about this the wrong way? What does --no-commit mean, if I am?
(Also, I asked this on #git earlier. If anyone happens to idle there, pardon
me for re-posting this so quickly. I've got terrible lag this morning, enough
to time out frequently.)
next reply other threads:[~2007-06-18 15:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-18 15:06 Brian L. Troutwine [this message]
2007-06-18 16:04 ` The --no-commit blues Alex Riesen
2007-06-19 8:52 ` Sergio
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=200706180806.26255.goofyheadedpunk@gmail.com \
--to=goofyheadedpunk@gmail.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox