diff options
author | SZEDER Gábor <szeder@ira.uka.de> | 2009-06-09 00:57:06 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-06-09 00:18:24 -0700 |
commit | f39d6ee2aad735641dce90f7e021e6b6862963c6 (patch) | |
tree | 32083082c7c8ae2c890294924ea2a9055e8c6bce /git-merge-octopus.sh | |
parent | Simplify some 'fprintf(stderr); return -1;' by using 'return error()' (diff) | |
download | tgif-f39d6ee2aad735641dce90f7e021e6b6862963c6.tar.xz |
Documentation: mention 'git stash pop --index' option explicitly
'git stash pop' supports the '--index' option since its initial
implementation (bd56ff54, git-stash: add new 'pop' subcommand,
2008-02-22), but its documentation does not mention it explicitly.
Moreover, both the usage shown by 'git stash -h' and the synopsis
section in the man page imply that 'git stash pop' does not have an
'--index' option.
First, this patch corrects the usage and the synopsis section.
Second, the patch moves the description of the '--index' option to the
'git stash pop' section in the documentation, and refers to it from
the 'git stash apply' section. This way it follows the intentions of
commit d1836637 (Documentation: teach stash/pop workflow instead of
stash/apply, 2009-05-28), as all 'git stash pop'-related documentation
will be in one place without references to 'git stash apply'.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions