Skip to content

Commit f5f8bd9

Browse files
knstPastaPastaPasta
authored andcommitted
doc: replace gfd() function to recommendation to use git diff-range
1 parent 6194e45 commit f5f8bd9

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -348,20 +348,9 @@ a worthwhile change based on the judgement of the maintainers.
348348

349349
When someone rebases their PR, it can often be very difficult to ensure that
350350
extra changes were not included in that force push. This changes could be anything
351-
from merge conflicts to someone attempting to sneak something into the PR. To check
352-
that a PR is the same before and after force push, you can use the following function.
353-
Place this function in your `~/.bashrc`. In order for this function to work, both the
354-
before and after commits must be present locally.
355-
356-
```
357-
function gfd() {
358-
local fp1=$(git show-branch --merge-base develop $1)
359-
local fp2=$(git show-branch --merge-base develop $2)
360-
echo fp1=$fp1
361-
echo fp2=$fp2
362-
diff --color=always -u -I'^[^-+]' <(git diff $fp1..$1) <(git diff $fp2..$2)
363-
}
364-
```
351+
from merge conflicts to someone attempting to sneak something into the PR.
352+
In order for `git range-diff` to work, both the before and after commits must be
353+
present locally. See chapter [rebasing changes](#rebasing-changes)
365354

366355
### Finding Reviewers
367356

0 commit comments

Comments
 (0)