Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
trivial: typo in git-commit.sh
author
Alex Riesen
<raa.lkml@gmail.com>
Thu, 5 Jan 2006 11:44:59 +0000
(12:44 +0100)
committer
Junio C Hamano
<junkio@cox.net>
Fri, 6 Jan 2006 01:23:16 +0000
(17:23 -0800)
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-commit.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
88fb958
)
diff --git
a/git-commit.sh
b/git-commit.sh
index 7e39c107cff93f601c51fec6544a0defe9814db1..82d743bd037db74f4233a620b001fb3002f346cc 100755
(executable)
--- a/
git-commit.sh
+++ b/
git-commit.sh
@@
-148,7
+148,7
@@
esac
if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
echo "#"
- echo "# It looks like you
r
may be committing a MERGE."
+ echo "# It looks like you may be committing a MERGE."
echo "# If this is not correct, please remove the file"
echo "# $GIT_DIR/MERGE_HEAD"
echo "# and try again"