aboutsummaryrefslogtreecommitdiff
path: root/Documentation/technical
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-03 14:16:17 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-03 14:16:17 -0700
commit6a319e393b856461bab89ffe332a02e71befee40 (patch)
tree730908c3beb0e261b4082db8b83cf11aa8c11b01 /Documentation/technical
parent1b57e56c6191c87b7b372fce3be05f930423780b (diff)
parente9e0643fe64b613b6596b79b59df8ff10746f1a1 (diff)
downloadgit-6a319e393b856461bab89ffe332a02e71befee40.tar.xz
Merge branch 'maint'
* maint: add gitignore entry to description about how to write a builtin gitattributes: Reword "attribute macro" to "macro attribute" gitattributes: Clarify discussion of attribute macros
Diffstat (limited to 'Documentation/technical')
-rw-r--r--Documentation/technical/api-builtin.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/technical/api-builtin.txt b/Documentation/technical/api-builtin.txt
index 5cb2b0590a..b0cafe87be 100644
--- a/Documentation/technical/api-builtin.txt
+++ b/Documentation/technical/api-builtin.txt
@@ -49,6 +49,8 @@ Additionally, if `foo` is a new command, there are 3 more things to do:
. Add an entry for `git-foo` to `command-list.txt`.
+. Add an entry for `/git-foo` to `.gitignore`.
+
How a built-in is called
------------------------