From: Jim Meyering <meyering@redhat.com>
Date: Sun, 27 Apr 2008 19:31:08 +0000 (+0200)
Subject: tweak HACKING advice
X-Git-Tag: v6.12~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cca6a8d7e525edb232160046d074fff16a76bbb5;p=thirdparty%2Fcoreutils.git

tweak HACKING advice
---

diff --git a/HACKING b/HACKING
index d61644392d..b40ff00582 100644
--- a/HACKING
+++ b/HACKING
@@ -26,11 +26,16 @@ That downloads the entire repository, including revision control history
 dating back to 1991.  The repository (the part you download, and which
 resides in coreutils/.git) currently weighs in at about 30MB.  So you
 don't want to download it more often than necessary.  Once downloaded,
-you can get incremental updates by running this command from inside
-your new coreutils/ directory:
+you can get incremental updates by running one of these commands from
+inside your new coreutils/ directory:
 
+If you have made *no* changes:
     git pull
 
+If you *have* made changes and committed them to "master", do this:
+    git fetch
+    git rebase origin
+
 
 *Before* you commit changes
 ===========================