From: Theodore Ts'o <tytso@mit•edu>
To: Junio C Hamano <junkio@cox•net>
Cc: git@vger•kernel.org, Theodore Ts'o <tytso@mit•edu>
Subject: [PATCH] mergetool: Fix abort command when resolving symlinks and deleted files
Date: Thu, 29 Mar 2007 11:44:22 -0400 [thread overview]
Message-ID: <11751830653835-git-send-email-tytso@mit.edu> (raw)
In-Reply-To: <11751830652803-git-send-email-tytso@mit.edu>
Signed-off-by: "Theodore Ts'o" <tytso@mit•edu>
---
git-mergetool.sh | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 5de2433..f73072a 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -73,13 +73,13 @@ resolve_symlink_merge () {
cleanup_temp_files --save-backup
return
;;
- [rR]*)
+ [rR]*)
git-checkout-index -f --stage=3 -- "$path"
git-add -- "$path"
cleanup_temp_files --save-backup
return
;;
- [qQ]*)
+ [aA]*)
exit 1
;;
esac
@@ -96,12 +96,12 @@ resolve_deleted_merge () {
cleanup_temp_files --save-backup
return
;;
- [dD]*)
+ [dD]*)
git-rm -- "$path"
cleanup_temp_files
return
;;
- [qQ]*)
+ [aA]*)
exit 1
;;
esac
--
1.5.1.rc2.1.g8afe-dirty
next prev parent reply other threads:[~2007-03-29 15:44 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-29 15:44 [GIT PULL] git mergetool fixes Theodore Ts'o
2007-03-29 15:44 ` [PATCH] Fix minor formatting issue in man page for git-mergetool Theodore Ts'o
2007-03-29 15:44 ` [PATCH] mergetool: Replace use of "echo -n" with printf(3) to be more portable Theodore Ts'o
2007-03-29 15:44 ` [PATCH] mergetool: Don't error out in the merge case where the local file is deleted Theodore Ts'o
2007-03-29 15:44 ` [PATCH] mergetool: portability fix: don't assume true is in /bin Theodore Ts'o
2007-03-29 15:44 ` [PATCH] mergetool: portability fix: don't use reserved word function Theodore Ts'o
2007-03-29 15:44 ` [PATCH] mergetool: factor out common code Theodore Ts'o
2007-03-29 15:44 ` [PATCH] mergetool: Remove spurious error message if merge.tool config option not set Theodore Ts'o
2007-03-29 15:44 ` Theodore Ts'o [this message]
2007-03-29 15:44 ` [PATCH] mergetool: Add support for Apple Mac OS X's opendiff command Theodore Ts'o
2007-03-29 15:44 ` [PATCH] mergetool: Make git-rm quiet when resolving a deleted file conflict Theodore Ts'o
2007-03-29 15:44 ` [PATCH] mergetool: Clean up description of files and prompts for merge resolutions Theodore Ts'o
2007-03-29 22:29 ` Matthias Lederhofer
2007-03-30 2:54 ` Theodore Tso
2007-03-30 14:46 ` Randal L. Schwartz
2007-03-29 15:57 ` [PATCH] mergetool: Replace use of "echo -n" with printf(3) to be more portable Matthias Lederhofer
2007-03-29 17:09 ` Theodore Tso
2007-03-29 22:02 ` Junio C Hamano
2007-03-29 22:15 ` Theodore Tso
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=11751830653835-git-send-email-tytso@mit.edu \
--to=tytso@mit$(echo .)edu \
--cc=git@vger$(echo .)kernel.org \
--cc=junkio@cox$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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