diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-08-01 14:38:05 +0200 |
|---|---|---|
| committer | Olav Vitters <olav@vitters.nl> | 2020-08-01 15:13:14 +0200 |
| commit | ef10cbdae097ab6e94efce16103e97587b36852c (patch) | |
| tree | f6a4ca46996c27bf06b5accd329e46b011e8f4ad | |
| parent | 0ed397ec98280b4f7253abd216dbb17655ee5074 (diff) | |
| download | initscripts-ef10cbdae097ab6e94efce16103e97587b36852c.tar initscripts-ef10cbdae097ab6e94efce16103e97587b36852c.tar.gz initscripts-ef10cbdae097ab6e94efce16103e97587b36852c.tar.bz2 initscripts-ef10cbdae097ab6e94efce16103e97587b36852c.tar.xz initscripts-ef10cbdae097ab6e94efce16103e97587b36852c.zip | |
make pre merge instructions consistent again
commit 7ff84293b012b6787888d9551c7a092492568e6f broke that
| -rw-r--r-- | README.Mageia.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/README.Mageia.md b/README.Mageia.md index f9dd9b0b..99bf35b6 100644 --- a/README.Mageia.md +++ b/README.Mageia.md @@ -99,7 +99,7 @@ You can then push this to us quite happily: #### Merging -Before doing a merge, it's good to minimize the changes with upstream. For example, if the fork is based upon 9.78, first check for the changes. Use: +Before doing a merge, it's good to minimize the changes with upstream. For example, if the fork is based upon 10.04, first check for the changes. Use: $ git diff 10.04...mga/distro/mga ':!man/' ':!mageia' ':!po-mageia' ':!man-mageia' @@ -108,7 +108,7 @@ In above command git is instructed to hide certain directories. Make sure to run We try to stick to merging only upstream tags. To do this we would simply do: $ git checkout distro/mga - $ git merge 9.78 + $ git merge 10.04 You then have the fun job of fixing the (no doubt) numerous conflicts! @@ -121,7 +121,7 @@ If you have decided to revert a file to the upstream version in your commit, ple #### Super patch Periodically, we will generate a **super patch** containing all our changes. This patch is generated from the upstream tag of the tarball we are using and our current HEAD. It is generated via a command similar to: - $ git diff 9.78..mga/distro/mga | xz >initscripts-mgaconf.patch.xz + $ git diff 10.04..mga/distro/mga | xz >initscripts-mgaconf.patch.xz * Note that the *upstream* branch for *distro/mga* is used (as it's prefixed with the remote name *mga/*). This is because you should be careful to only generate the super patch from changes you **have already pushed**. If you do not do this other contributors may not be able to verify your patch and some commits may even be lost. You have been warned! |