aboutsummaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2006-07-10 01:50:18 -0400
committerJunio C Hamano <junkio@cox.net>2006-07-10 00:36:44 -0700
commit82e5a82fd73edb80a841f5fab1660e14b9b8f3ad (patch)
tree9661cdf47ee3bf69192ff336e0514fc6dd607728 /git-am.sh
parent930cf7dd7cc6b87d173f182230763e1f1913d319 (diff)
downloadgit-82e5a82fd73edb80a841f5fab1660e14b9b8f3ad.tar.gz
git-82e5a82fd73edb80a841f5fab1660e14b9b8f3ad.tar.xz
Fix more typos, primarily in the code
The only visible change is that git-blame doesn't understand "--compability" anymore, but it does accept "--compatibility" instead, which is already documented. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 679045a54..db9a20a81 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -77,7 +77,7 @@ fall_back_3way () {
# This is not so wrong. Depending on which base we picked,
# orig_tree may be wildly different from ours, but his_tree
# has the same set of wildly different changes in parts the
- # patch did not touch, so resolve ends up cancelling them,
+ # patch did not touch, so resolve ends up canceling them,
# saying that we reverted all those changes.
git-merge-resolve $orig_tree -- HEAD $his_tree || {