Merge pull request #50 from anonfunc/patch-1

Use vared in zsh instead of read.
This commit is contained in:
Nathan Broadbent
2012-08-27 16:57:30 -07:00

View File

@@ -175,9 +175,7 @@ theirs(){ _git_resolve_merge_conflict "their" "$@"; }
git_commit_prompt() {
local commit_msg
if [[ $shell == "zsh" ]]; then
# zsh 'read' is weak. If you know how to make this better, please send a pull request.
# (Bash 'read' supports prompt, arrow keys, home/end, up through bash history, etc.)
echo -n "Commit Message: "; read commit_msg
vared -h -p "Commit Message: " commit_msg
else
read -r -e -p "Commit Message: " commit_msg
fi