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>
This commit is contained in:
committed by
Junio C Hamano
parent
930cf7dd7c
commit
82e5a82fd7
@ -182,7 +182,7 @@ git-apply --index "$PATCHFILE" || {
|
||||
# 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.
|
||||
|
||||
if git-merge-resolve $orig_tree -- HEAD $his_tree
|
||||
|
||||
Reference in New Issue
Block a user