diff options
| author | Olav Vitters <olav@vitters.nl> | 2020-07-30 22:53:56 +0200 |
|---|---|---|
| committer | Olav Vitters <olav@vitters.nl> | 2020-07-30 22:53:56 +0200 |
| commit | 7ff84293b012b6787888d9551c7a092492568e6f (patch) | |
| tree | 5e4d8b09134003f04162bbd0460bdaa486b01d27 | |
| parent | 3034c07fb0ede9a362680a72cf2d06daf1e6241a (diff) | |
| download | initscripts-7ff84293b012b6787888d9551c7a092492568e6f.tar initscripts-7ff84293b012b6787888d9551c7a092492568e6f.tar.gz initscripts-7ff84293b012b6787888d9551c7a092492568e6f.tar.bz2 initscripts-7ff84293b012b6787888d9551c7a092492568e6f.tar.xz initscripts-7ff84293b012b6787888d9551c7a092492568e6f.zip | |
README.Mageia.md: update pre merge instructions with new layout and current upstream version
| -rw-r--r-- | README.Mageia.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/README.Mageia.md b/README.Mageia.md index 6d352bd5..cdfd7c0f 100644 --- a/README.Mageia.md +++ b/README.Mageia.md @@ -100,7 +100,7 @@ You can then push this to us quite happily: 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: - $ git diff 9.78...mga/distro/mga ':!man/' ':!mandriva/ChangeLog' ':!*.po' ':!mandriva/po' + $ git diff 10.04...mga/distro/mga ':!man/' ':!mageia' ':!po-mageia' ':!man-mageia' In above command git is instructed to hide certain directories. Make sure to run the command from the main directory for this to work. |