summaryrefslogtreecommitdiff
path: root/Documentation/rev-list-options.txt
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@student.ethz.ch>2010-02-15 17:05:46 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-15 21:46:27 -0800
commit460ccd0e19774fd5e4f69de5a454068c686ac5a6 (patch)
treef507de18c02dedc3c2bbebab7856df5ee3b51467 /Documentation/rev-list-options.txt
parentdiff: make sure --output=/bad/path is caught (diff)
downloadtgif-460ccd0e19774fd5e4f69de5a454068c686ac5a6.tar.xz
stash pop: remove 'apply' options during 'drop' invocation
The 'git stash pop' option parsing used to remove the first argument in --index mode. At the time this was implemented, this first argument was always --index. However, since the invention of the -q option in fcdd0e9 (stash: teach quiet option, 2009-06-17) you can cause an internal invocation of git stash drop --index by running git stash pop -q --index which then of course fails because drop doesn't know --index. To handle this, instead let 'git stash apply' decide what the future argument to 'drop' should be. Warning: this means that 'git stash apply' must parse all options that 'drop' can take, and deal with them in the same way. This is currently true for its only option -q. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/rev-list-options.txt')
0 files changed, 0 insertions, 0 deletions