* [PATCH] git-revert: use GIT_DIR shell variable for the MERGE_MSG
@ 2006-10-12 22:11 Luben Tuikov
0 siblings, 0 replies; only message in thread
From: Luben Tuikov @ 2006-10-12 22:11 UTC (permalink / raw)
To: git
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2006-10-12 22:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-12 22:11 [PATCH] git-revert: use GIT_DIR shell variable for the MERGE_MSG Luben Tuikov
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).