From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Feb 2013 16:27:17 +0000 (-0800)
Subject: Merge branch 'wk/user-manual'
X-Git-Tag: v1.8.2-rc1~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3ca26e8cdc19f3758a3803358f8ae1a03a4eb2e4

Merge branch 'wk/user-manual'

Further updates to the user manual.

* wk/user-manual:
user-manual: Flesh out uncommitted changes and submodule updates
user-manual: Use request-pull to generate "please pull" text
user-manual: Reorganize the reroll sections, adding 'git rebase -i'
---

3ca26e8cdc19f3758a3803358f8ae1a03a4eb2e4
diff --cc Documentation/user-manual.txt
index 1076588d6f,bb03bc88b8..5f36f8115f
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@@ -3721,10 -3739,12 +3740,12 @@@ module 
  
  NOTE: The changes are still visible in the submodule's reflog.
  
- This is not the case if you did not commit your changes.
+ If you have uncommitted changes in your submodule working tree, `git
+ submodule update` will not overwrite them.  Instead, you get the usual
+ warning about not being able switch from a dirty branch.
  
  [[low-level-operations]]
 -Low-level git operations
 +Low-level Git operations
  ========================
  
  Many of the higher-level commands were originally implemented as shell