sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 03:22:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

doc: replace gfd() function to recommendation to use git diff-range

Browse Source
This commit is contained in:
Konstantin Akimov 2024-04-23 22:54:44 +07:00 committed by pasta
parent 6194e454d7
commit f5f8bd9e9a
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CONTRIBUTING.md
View File

@ -348,20 +348,9 @@ a worthwhile change based on the judgement of the maintainers.
When someone rebases their PR, it can often be very difficult to ensure that
extra changes were not included in that force push. This changes could be anything
from merge conflicts to someone attempting to sneak something into the PR. To check
that a PR is the same before and after force push, you can use the following function.
Place this function in your `~/.bashrc`. In order for this function to work, both the
before and after commits must be present locally.
```
function gfd() {
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)
}
```
from merge conflicts to someone attempting to sneak something into the PR.
In order for `git range-diff` to work, both the before and after commits must be
present locally. See chapter [rebasing changes](#rebasing-changes)
### Finding Reviewers