bug
This commit is contained in:
parent
743e17ba0f
commit
c3683a50cd
|
@ -607,7 +607,7 @@ function __git_init_ff() {
|
||||||
s="$(git rev-parse --verify "$s")" || return 1
|
s="$(git rev-parse --verify "$s")" || return 1
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
function __git_check_can_ff() {
|
function __git_can_ff() {
|
||||||
[ "$1" == "$(git merge-base "$1" "$2")" ]
|
[ "$1" == "$(git merge-base "$1" "$2")" ]
|
||||||
}
|
}
|
||||||
function git_is_ancestor() {
|
function git_is_ancestor() {
|
||||||
|
|
Loading…
Reference in New Issue