summaryrefslogtreecommitdiff
path: root/Documentation/git-stash.txt
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2007-07-02 05:24:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-02 06:33:52 (GMT)
commit9a5391cf1836fa1b66f3c89ce9b38f8249bb0521 (patch)
tree4ad62072fef42930350a4fc24821af01a93253bc /Documentation/git-stash.txt
parent401de4057ac83d473f8bead9b11d00b6371bd6a0 (diff)
downloadgit-9a5391cf1836fa1b66f3c89ce9b38f8249bb0521.zip
git-9a5391cf1836fa1b66f3c89ce9b38f8249bb0521.tar.gz
git-9a5391cf1836fa1b66f3c89ce9b38f8249bb0521.tar.bz2
Documentation: quote {non-attributes} for asciidoc
Asciidoc treats {foo} as an attribute to be substituted; if 'foo' doesn't exist as an attribute, then the entire line gets dropped. When the literal {foo} is desired, \{foo} is required. The exceptions to this rule are: - inside literal blocks - if the 'foo' contains non-alphanumeric characters (e.g., {foo|bar} is assumed not to be an attribute) Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-stash.txt')
-rw-r--r--Documentation/git-stash.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 4dc344d..b7d263d 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -26,8 +26,8 @@ list`.
The latest stash you created is stored in `$GIT_DIR/refs/stash`; older
stashes are found in the reflog of this reference and can be named using
-the usual reflog syntax (e.g. `stash@{1}` is the most recently
-created stash, `stash@{2}` is the one before it, `stash@{2.hours.ago}`
+the usual reflog syntax (e.g. `stash@\{1}` is the most recently
+created stash, `stash@\{2}` is the one before it, `stash@\{2.hours.ago}`
is also possible).
OPTIONS
@@ -41,7 +41,7 @@ save::
list::
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
+ with its name (e.g. `stash@\{0}` is the latest stash, `stash@\{1} is
the one before, etc.), the name of the branch that was current when the
stash was made, and a short description of the commit the stash was
based on.
@@ -57,7 +57,7 @@ show [<stash>]::
stashed state and its original parent. When no `<stash>` is given,
shows the latest one. By default, the command shows the diffstat, but
it will accept any format known to `git-diff` (e.g., `git-stash show
- -p stash@{2}` to view the second most recent stash in patch form).
+ -p stash@\{2}` to view the second most recent stash in patch form).
apply [<stash>]::