File tree Expand file tree Collapse file tree 1 file changed +3
-14
lines changed Expand file tree Collapse file tree 1 file changed +3
-14
lines changed Original file line number Diff line number Diff line change @@ -348,20 +348,9 @@ a worthwhile change based on the judgement of the maintainers.
348
348
349
349
When someone rebases their PR, it can often be very difficult to ensure that
350
350
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 )
365
354
366
355
### Finding Reviewers
367
356
You can’t perform that action at this time.
0 commit comments