summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Liam Beguin <liambeguin@gmail.com>2017-06-17 18:30:52 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-18 22:18:15 -0700
commit90f64f1cf5fe20bbac7353028e23f28ceca61195 (patch)
treeb629cb56e7a76c8662412ac95397a6b0e51c73d2 /Documentation
parentstatus: add optional stash count information (diff)
downloadtgif-90f64f1cf5fe20bbac7353028e23f28ceca61195.tar.xz
glossary: define 'stash entry'
Signed-off-by: Liam Beguin <liambeguin@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/glossary-content.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 6e991c2469..b71b943b12 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -570,6 +570,10 @@ The most notable example is `HEAD`.
is created by giving the `--depth` option to linkgit:git-clone[1], and
its history can be later deepened with linkgit:git-fetch[1].
+[[def_stash]]stash entry::
+ An <<def_object,object>> used to temporarily store the contents of a
+ <<def_dirty,dirty>> working directory and the index for future reuse.
+
[[def_submodule]]submodule::
A <<def_repository,repository>> that holds the history of a
separate project inside another repository (the latter of