Ooops! Signed-off-by: Luben Tuikov <ltuikov@xxxxxxxxx> --- 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html