From f6787fa816b2c85457e72189cba5523e3d49bfe0 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Tue, 11 Jun 2019 20:51:32 -0400 Subject: [PATCH] minor readme update --- README.FSF | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.FSF b/README.FSF index 5ae512c..37e0ce9 100644 --- a/README.FSF +++ b/README.FSF @@ -20,9 +20,9 @@ instead generated from the .in file by running make configure. Note, make configure must be run from /home/mharc (checkout into that directory on your local system). -The lists.fsf branch should be rebased to any changes from master, like this: +The lists.fsf.org branch should be rebased to any changes from master, like this: -git checkout lists.fsf +git checkout lists.fsf.org git rebase master # if there are merge conflicts, manually merge any .in files, then make configure @@ -35,7 +35,7 @@ Then on lists.fsf.org: su mharc cd git fetch -git reset --hard origin/lists.fsf +git reset --hard origin/lists.fsf.org To update existing lists headers, the only way namazu supports is to -- 2.25.1