summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantrik <antrik@users.sf.net>2010-03-01 11:41:38 +0100
committerantrik <antrik@users.sf.net>2010-03-01 11:42:37 +0100
commit34f4ff3b4de73a92161604d984e8331aedf2335a (patch)
treee9df4f1cc6629d4f1d23da9f6de51a5699c7777c
parent640824798320a70bffef2b96974896222b66f414 (diff)
Suggest pull --rebase rather than manual fetch+rebase
-rw-r--r--contributing/web_pages.mdwn4
1 files 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