From: Luben Tuikov <ltuikov@yahoo.com>
To: git@vger.kernel.org
Subject: [PATCH] git-revert: use GIT_DIR shell variable for the MERGE_MSG
Date: Thu, 12 Oct 2006 15:11:07 -0700 (PDT) [thread overview]
Message-ID: <20061012221107.73011.qmail@web31804.mail.mud.yahoo.com> (raw)
Ooops!
Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
---
git-revert.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-revert.sh b/git-revert.sh
index 2e23cf4..6eab3c7 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -145,7 +145,7 @@ git-read-tree -m -u --aggressive $base $
result=$(git-write-tree 2>/dev/null) || {
echo >&2 "Simple $me fails; trying Automatic $me."
git-merge-index -o git-merge-one-file -a || {
- mv -f .msg .git/MERGE_MSG
+ mv -f .msg "$GIT_DIR/MERGE_MSG"
{
echo '
Conflicts:
--
1.4.3.rc2.gd9edb
reply other threads:[~2006-10-12 22:11 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20061012221107.73011.qmail@web31804.mail.mud.yahoo.com \
--to=ltuikov@yahoo.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;
as well as URLs for NNTP newsgroup(s).