summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAssaf Gordon <assafgordon@gmail.com>2012-12-14 08:47:17 +0100
committerBernhard Voelker <mail@bernhard-voelker.de>2012-12-15 00:20:15 +0100
commite9870faf9933a32de11cf90883e537f72e4f7de5 (patch)
treee9a395b3f4b8da00d22f90b1eb474ba5ef1ab155
parentc321f7450f24c495382aabf9125a2701f47e5a04 (diff)
downloadcoreutils-e9870faf9933a32de11cf90883e537f72e4f7de5.tar.xz
doc: mention "git stash" in HACKING
* HACKING: In the paragraph about switching branches, mention "git stash" as a way to continue while preserving uncommitted changes.
-rw-r--r--HACKING2
1 files changed, 2 insertions, 0 deletions
diff --git a/HACKING b/HACKING
index f3f961a2a..adc305ff2 100644
--- a/HACKING
+++ b/HACKING
@@ -120,6 +120,8 @@ Note 2:
sometimes the checkout will fail, telling you that your local
modifications conflict with changes required to switch branches.
However, in any case, you will *not* lose your uncommitted changes.
+ Run "git stash" to temporarily hide uncommitted changes in your
+ local directory, restoring a clean working directory.
Anyhow, get back onto your just-created branch: