summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-21 00:13:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-21 00:13:13 (GMT)
commit23f12912d1b6c608a7418d242e257b7239861f61 (patch)
tree1fc8a793688652e08f7b0a4b11b9a5bc2f3f9733 /Documentation
parentf27e55864317611385be4d33b3c53ca787379df9 (diff)
parent0ca15e7217285edaa6c93b53165e1250d25f030b (diff)
downloadgit-23f12912d1b6c608a7418d242e257b7239861f61.zip
git-23f12912d1b6c608a7418d242e257b7239861f61.tar.gz
git-23f12912d1b6c608a7418d242e257b7239861f61.tar.bz2
Merge branch 'maint'
* maint: Clarified the meaning of git-add -u in the documentation git-clone.sh: properly configure remote even if remote's head is dangling Documentation/git-stash: document options for git stash list send-email: squelch warning due to comparing undefined $_ to ""
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-add.txt4
-rw-r--r--Documentation/git-stash.txt5
2 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 9d2ac86..4779909 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -74,8 +74,8 @@ OPTIONS
Update only files that git already knows about. This is similar
to what "git commit -a" does in preparation for making a commit,
except that the update is limited to paths specified on the
- command line. If no paths are specified, all tracked files are
- updated.
+ command line. If no paths are specified, all tracked files in the
+ current directory and its subdirectories are updated.
\--refresh::
Don't add the file(s), but only refresh their stat()
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index cd0dc1b..48e6f5a 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -43,7 +43,7 @@ save [<message>]::
subcommand is given. The <message> part is optional and gives
the description along with the stashed state.
-list::
+list [<options>]::
List the stashes that you currently have. Each 'stash' is listed
with its name (e.g. `stash@\{0}` is the latest stash, `stash@\{1}` is
@@ -55,6 +55,9 @@ list::
stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation
stash@{1}: On master: 9cc0589... Add git-stash
----------------------------------------------------------------
++
+The command takes options applicable to the linkgit:git-log[1]
+command to control what is shown and how.
show [<stash>]::