diff options
| author | Naïm Favier <n@monade.li> | 2022-05-29 21:53:19 +0200 |
|---|---|---|
| committer | Naïm Favier <n@monade.li> | 2022-05-29 22:10:47 +0200 |
| commit | d2990717f165acba5817d20f332159c797fad508 (patch) | |
| tree | 944a02e2c3bf0f2d97a15567bd592159ac7faf28 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | e37248668b483ea8076390df42b01b766a43a57f (diff) | |
CONTRIBUTING.md: simplify rebasing instructions
Makes the instructions easier to remember (and type) using the
`git rebase --onto A...B` syntax to find the merge base between A and B
(which has been in git for at least 10 years).
We also assume that the merge base between staging and master is also
the merge base between staging and the current branch (since it is based
on master), and giving master as the <upstream> branch makes git
consider the commits in the current branch that are not in master, so
there's no need to compute the merge base between master and the current
branch.
In the same spirit of discouraging copy-and-paste, use a placeholder
name for the current branch instead of `$(git branch --show-current)`.
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions