From 7ff84293b012b6787888d9551c7a092492568e6f Mon Sep 17 00:00:00 2001 From: Olav Vitters Date: Thu, 30 Jul 2020 22:53:56 +0200 Subject: README.Mageia.md: update pre merge instructions with new layout and current upstream version --- README.Mageia.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. -- cgit v1.2.1