From 34f4ff3b4de73a92161604d984e8331aedf2335a Mon Sep 17 00:00:00 2001 From: antrik Date: Mon, 1 Mar 2010 11:41:38 +0100 Subject: Suggest pull --rebase rather than manual fetch+rebase --- contributing/web_pages.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contributing/web_pages.mdwn b/contributing/web_pages.mdwn index 390cb942..13dc7a3e 100644 --- a/contributing/web_pages.mdwn +++ b/contributing/web_pages.mdwn @@ -131,8 +131,8 @@ For all cases: if you omit `[dest]` it will default to `hurd-web`. Later, you can just `cd` into the `hurd-web` directory and run a `git pull` to get hold of the latest changes others have been installing in the mean time. -(In most cases, even better would be to do a `git fetch`, followed by a `git -rebase origin/master` to avoid useless *Merge branch ...* messages. See the +(In most cases, you should use `git pull --rebase`, +to avoid useless *Merge branch ...* messages. See the Git documentation for details.) ## Editing the Content -- cgit v1.2.3