diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6284bad038..4a7f33c3a5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -295,8 +295,8 @@ before and after commits must be present locally. ``` function gfd() { - local fp1=$(git merge-base --fork-point develop $1) - local fp2=$(git merge-base --fork-point develop $2) + local fp1=$(git show-branch --merge-base develop $1) + local fp2=$(git show-branch --merge-base develop $2) echo fp1=$fp1 echo fp2=$fp2 diff --color=always -u -I'^[^-+]' <(git diff $fp1..$1) <(git diff $fp2..$2)