From 50bf38f6954eeb37420411e1e69ad14b6d62a81f Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 7 Dec 2011 00:35:29 +0100 Subject: [PATCH] extended the stash help entry Signed-off-by: Sven Strickroth --- doc/images/en/ContextMenuStash.png | Bin 0 -> 4107 bytes doc/images/en/stash.png | Bin 0 -> 4539 bytes doc/source/en/TortoiseGit/tsvn_dug/dug_stash.xml | 19 ++++++++++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 doc/images/en/ContextMenuStash.png create mode 100644 doc/images/en/stash.png diff --git a/doc/images/en/ContextMenuStash.png b/doc/images/en/ContextMenuStash.png new file mode 100644 index 0000000000000000000000000000000000000000..48623f8030f1c14bfc705b428bb027c4c15e7156 GIT binary patch literal 4107 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 G(fVDbQ<#Koq{&n*SOTvk>V04xCj3CP_7WU#V; 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 literal 0 HcwPel00001 diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_stash.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_stash.xml index 2cc890f9c..912879ec0 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_stash.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_stash.xml @@ -15,7 +15,24 @@ TortoiseGit Stash Save - A dialog will pop up where you can optionally enter a message for this state. + A dialog will pop up where you can optionally enter a message for this state: +
+ Stash save dialog + +
+ You can also select include untracked, to stash untracked files away, too. + + + When TortoiseGit detects that a stashed changes exist, the context menu will be extended: +
+ (un)stash options + +
+ The stash is implemented as a stack. Stash Apply will apply the changes of the latest stash + to your working copy. Stash Pop does the same, but will remove the latest stash from the stack + after applying it. Stash Save is still possible and will stash the current changes of the working + copy to the top of the stack. Stash List provides an overview of all the whole stash stack. You + can also remove and view the stashed changes there (similarly to the and ).
You can find more information at -- 2.11.4.GIT