[PATCH 5/5] doc: git-add: explain inconsistent terminology

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Julia Evans <julia@xxxxxxx>

I think the fact that git uses these three terms interchangeably is
extremely confusing and that it deserves to be noted.

Signed-off-by: Julia Evans <julia@xxxxxxx>
---
 Documentation/git-add.adoc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Documentation/git-add.adoc b/Documentation/git-add.adoc
index 77cadbfee8e3..084342155f8b 100644
--- a/Documentation/git-add.adoc
+++ b/Documentation/git-add.adoc
@@ -40,6 +40,13 @@ exact filename of an ignored file (e.g. `git add ignored.txt`), `git
 add` will fail with a list of ignored files. Otherwise it will silently
 ignore the file.
 
+TERMINOLOGY NOTE
+----------------
+
+Git uses the terms "staging area", "index" and "cache" interchangeably
+for historical reasons. Many commands have flags like `--staged`,
+`--index`, or `--cached`, and they all refer to the index.
+
 OPTIONS
 -------
 `<pathspec>...`::
-- 
gitgitgadget




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux