From: Martin Langhoff <martin.langhoff@gmail.com>
To: GIT <git@vger.kernel.org>
Subject: cg-update/cg-merge refuse to update if state is dirty?
Date: Tue, 23 Aug 2005 20:09:04 +1200 [thread overview]
Message-ID: <46a038f905082301096285a3cb@mail.gmail.com> (raw)
Should cg-update or cg-merge be refusing to merge if the tree is
dirty? If there are uncommitted files, and the merge fails, a lot of
unrelated changes will be dumped on the working tree, which ends up
with a mix of things.
cheers,
martin
next reply other threads:[~2005-08-23 8:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-23 8:09 Martin Langhoff [this message]
2005-08-23 14:22 ` cg-update/cg-merge refuse to update if state is dirty? Carl Baldwin
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=46a038f905082301096285a3cb@mail.gmail.com \
--to=martin.langhoff@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 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.