1 Like other projects, we also have some guidelines for our code. For
2 Git in general, a few rough rules are:
4 - Most importantly, we never say "It's in POSIX; we'll happily
5 ignore your needs should your system not conform to it."
6 We live in the real world.
8 - However, we often say "Let's stay away from that construct,
9 it's not even in POSIX".
11 - In spite of the above two rules, we sometimes say "Although
12 this is not in POSIX, it (is so convenient | makes the code
13 much more readable | has other good characteristics) and
14 practically all the platforms we care about support it, so
17 Again, we live in the real world, and it is sometimes a
18 judgement call, the decision based more on real world
19 constraints people face than what the paper standard says.
21 - Fixing style violations while working on a real change as a
22 preparatory clean-up step is good, but otherwise avoid useless code
23 churn for the sake of conforming to the style.
25 "Once it _is_ in the tree, it's not really worth the patch noise to
27 Cf. https://lore.kernel.org/all/20100126160632.3bdbe172.akpm@linux-foundation.org/
29 - Log messages to explain your changes are as important as the
30 changes themselves. Clearly written code and in-code comments
31 explain how the code works and what is assumed from the surrounding
32 context. The log messages explain what the changes wanted to
33 achieve and why the changes were necessary (more on this in the
34 accompanying SubmittingPatches document).
36 Make your code readable and sensible, and don't try to be clever.
38 As for more concrete guidelines, just imitate the existing code
39 (this is a good guideline, no matter which project you are
40 contributing to). It is always preferable to match the _local_
41 convention. New code added to Git suite is expected to match
42 the overall style of existing code. Modifications to existing
43 code are expected to match the style the surrounding code already
44 uses (even if it doesn't match the overall style of existing code).
46 But if you must have a list of rules, here are some language
47 specific ones. Note that Documentation/ToolsForGit.txt document
48 has a collection of tips to help you use some external tools
49 to conform to these guidelines.
51 For shell scripts specifically (not exhaustive):
53 - We use tabs for indentation.
55 - Case arms are indented at the same depth as case and esac lines,
67 - Redirection operators should be written with space before, but no
68 space after them. In other words, write 'echo test >"$file"'
69 instead of 'echo test> $file' or 'echo test > $file'. Note that
70 even though it is not required by POSIX to double-quote the
71 redirection target in a variable (as shown above), our code does so
72 because some versions of bash issue a warning without the quotes.
75 cat hello > world < universe
79 cat hello >world <universe
82 - We prefer $( ... ) for command substitution; unlike ``, it
83 properly nests. It should have been the way Bourne spelled
84 it from day one, but unfortunately isn't.
86 - If you want to find out if a command is available on the user's
87 $PATH, you should use 'type <command>', instead of 'which <command>'.
88 The output of 'which' is not machine parsable and its exit code
89 is not reliable across platforms.
91 - We use POSIX compliant parameter substitutions and avoid bashisms;
94 - We use ${parameter-word} and its [-=?+] siblings, and their
95 colon'ed "unset or null" form.
97 - We use ${parameter#word} and its [#%] siblings, and their
98 doubled "longest matching" form.
100 - No "Substring Expansion" ${parameter:offset:length}.
104 - No pattern replacement ${parameter/pattern/string}.
106 - We use Arithmetic Expansion $(( ... )).
108 - We do not use Process Substitution <(list) or >(list).
110 - Do not write control structures on a single line with semicolon.
111 "then" should be on the next line for if statements, and "do"
112 should be on the next line for "while" and "for".
115 if test -f hello; then
125 - If a command sequence joined with && or || or | spans multiple
126 lines, put each command on a separate line and put && and || and |
127 operators at the end of each line, rather than the start. This
128 means you don't need to use \ to join lines, since the above
129 operators imply the sequence isn't finished.
132 grep blob verify_pack_result \
133 | awk -f print_1.awk \
138 grep blob verify_pack_result |
143 - We prefer "test" over "[ ... ]".
145 - We do not write the noiseword "function" in front of shell
148 - We prefer a space between the function name and the parentheses,
149 and no space inside the parentheses. The opening "{" should also
160 - As to use of grep, stick to a subset of BRE (namely, no \{m,n\},
161 [::], [==], or [..]) for portability.
163 - We do not use \{m,n\};
165 - We do not use ? or + (which are \{0,1\} and \{1,\}
166 respectively in BRE) but that goes without saying as these
167 are ERE elements not BRE (note that \? and \+ are not even part
168 of BRE -- making them accessible from BRE is a GNU extension).
170 - Use Git's gettext wrappers in git-sh-i18n to make the user
171 interface translatable. See "Marking strings for translation" in
174 - We do not write our "test" command with "-a" and "-o" and use "&&"
175 or "||" to concatenate multiple "test" commands instead, because
176 the use of "-a/-o" is often error-prone. E.g.
178 test -n "$x" -a "$a" = "$b"
180 is buggy and breaks when $x is "=", but
182 test -n "$x" && test "$a" = "$b"
184 does not have such a problem.
186 - Even though "local" is not part of POSIX, we make heavy use of it
187 in our test suite. We do not use it in scripted Porcelains, and
188 hopefully nobody starts using "local" before all shells that matter
189 support it (notably, ksh from AT&T Research does not support it yet).
191 - Some versions of shell do not understand "export variable=value",
192 so we write "variable=value" and then "export variable" on two
195 - Some versions of dash have broken variable assignment when prefixed
196 with "local", "export", and "readonly", in that the value to be
197 assigned goes through field splitting at $IFS unless quoted.
200 local variable=$value
201 local variable=$(command args)
204 local variable="$value"
205 local variable="$(command args)"
207 - The common construct
211 to temporarily set and export environment variable VAR only while
212 "command args" is running is handy, but this triggers an
213 unspecified behaviour according to POSIX when used for a command
214 that is not an external command (like shell functions). Indeed,
215 dash 0.5.10.2-6 on Ubuntu 20.04, /bin/sh on FreeBSD 13, and AT&T
216 ksh all make a temporary assignment without exporting the variable,
217 in such a case. As it does not work portably across shells, do not
218 use this syntax for shell functions. A common workaround is to do
219 an explicit export in a subshell, like so:
231 but be careful that the effect "func" makes to the variables in the
232 current shell will be lost across the subshell boundary.
234 - Use octal escape sequences (e.g. "\302\242"), not hexadecimal (e.g.
235 "\xc2\xa2") in printf format strings, since hexadecimal escape
236 sequences are not portable.
241 - We use tabs to indent, and interpret tabs as taking up to
244 - Nested C preprocessor directives are indented after the hash by one
245 space per nesting level.
254 - We try to keep to at most 80 characters per line.
256 - As a Git developer we assume you have a reasonably modern compiler
257 and we recommend you to enable the DEVELOPER makefile knob to
258 ensure your patch is clear of all compiler warnings we care about,
259 by e.g. "echo DEVELOPER=1 >>config.mak".
261 - We try to support a wide range of C compilers to compile Git with,
262 including old ones. As of Git v2.35.0 Git requires C99 (we check
263 "__STDC_VERSION__"). You should not use features from a newer C
264 standard, even if your compiler groks them.
266 New C99 features have been phased in gradually, if something's new
267 in C99 but not used yet don't assume that it's safe to use, some
268 compilers we target have only partial support for it. These are
269 considered safe to use:
271 . since around 2007 with 2b6854c863a, we have been using
272 initializer elements which are not computable at load time. E.g.:
274 const char *args[] = { "constant", variable, NULL };
276 . since early 2012 with e1327023ea, we have been using an enum
277 definition whose last element is followed by a comma. This, like
278 an array initializer that ends with a trailing comma, can be used
279 to reduce the patch noise when adding a new identifier at the end.
281 . since mid 2017 with cbc0f81d, we have been using designated
282 initializers for struct (e.g. "struct t v = { .val = 'a' };").
284 . since mid 2017 with 512f41cf, we have been using designated
285 initializers for array (e.g. "int array[10] = { [5] = 2 }").
287 . since early 2021 with 765dc168882, we have been using variadic
288 macros, mostly for printf-like trace and debug macros.
290 . since late 2021 with 44ba10d6, we have had variables declared in
291 the for loop "for (int i = 0; i < 10; i++)".
293 New C99 features that we cannot use yet:
295 . %z and %zu as a printf() argument for a size_t (the %z being for
296 the POSIX-specific ssize_t). Instead you should use
297 printf("%"PRIuMAX, (uintmax_t)v). These days the MSVC version we
298 rely on supports %z, but the C library used by MinGW does not.
300 . Shorthand like ".a.b = *c" in struct initializations is known to
301 trip up an older IBM XLC version, use ".a = { .b = *c }" instead.
302 See the 33665d98 (reftable: make assignments portable to AIX xlc
305 - Variables have to be declared at the beginning of the block, before
306 the first statement (i.e. -Wdeclaration-after-statement).
308 - NULL pointers shall be written as NULL, not as 0.
310 - When declaring pointers, the star sides with the variable
311 name, i.e. "char *string", not "char* string" or
312 "char * string". This makes it easier to understand code
313 like "char *string, c;".
315 - Use whitespace around operators and keywords, but not inside
316 parentheses and not around functions. So:
326 - Do not explicitly compare an integral value with constant 0 or '\0',
327 or a pointer value with constant NULL. For instance, to validate that
328 counted array <ptr, cnt> is initialized but has no elements, write:
331 BUG("empty array expected");
335 if (ptr == NULL || cnt != 0);
336 BUG("empty array expected");
338 - We avoid using braces unnecessarily. I.e.
344 is frowned upon. But there are a few exceptions:
346 - When the statement extends over a few lines (e.g., a while loop
347 with an embedded conditional, or a comment). E.g.:
358 * This one requires some explanation,
359 * so we're better off with braces to make
360 * it obvious that the indentation is correct.
365 - When there are multiple arms to a conditional and some of them
366 require braces, enclose even a single line block in braces for
377 - We try to avoid assignments in the condition of an "if" statement.
379 - Try to make your code understandable. You may put comments
380 in, but comments invariably tend to stale out when the code
381 they were describing changes. Often splitting a function
382 into two makes the intention of the code much clearer.
384 - Multi-line comments include their delimiters on separate lines from
389 * multi-line comment.
392 Note however that a comment that explains a translatable string to
393 translators uses a convention of starting with a magic token
394 "TRANSLATORS: ", e.g.
397 * TRANSLATORS: here is a comment that explains the string to
398 * be translated, that follows immediately after it.
400 _("Here is a translatable string explained by the above.");
402 - Double negation is often harder to understand than no negation
405 - There are two schools of thought when it comes to comparison,
406 especially inside a loop. Some people prefer to have the less stable
407 value on the left hand side and the more stable value on the right hand
408 side, e.g. if you have a loop that counts variable i down to the
411 while (i > lower_bound) {
416 Other people prefer to have the textual order of values match the
417 actual order of values in their comparison, so that they can
418 mentally draw a number line from left to right and place these
419 values in order, i.e.
421 while (lower_bound < i) {
426 Both are valid, and we use both. However, the more "stable" the
427 stable side becomes, the more we tend to prefer the former
428 (comparison with a constant, "i > 0", is an extreme example).
429 Just do not mix styles in the same part of the code and mimic
430 existing styles in the neighbourhood.
432 - There are two schools of thought when it comes to splitting a long
433 logical line into multiple lines. Some people push the second and
434 subsequent lines far enough to the right with tabs and align them:
436 if (the_beginning_of_a_very_long_expression_that_has_to ||
437 span_more_than_a_single_line_of ||
441 while other people prefer to align the second and the subsequent
442 lines with the column immediately inside the opening parenthesis,
443 with tabs and spaces, following our "tabstop is always a multiple
446 if (the_beginning_of_a_very_long_expression_that_has_to ||
447 span_more_than_a_single_line_of ||
451 Both are valid, and we use both. Again, just do not mix styles in
452 the same part of the code and mimic existing styles in the
455 - When splitting a long logical line, some people change line before
456 a binary operator, so that the result looks like a parse tree when
457 you turn your head 90-degrees counterclockwise:
459 if (the_beginning_of_a_very_long_expression_that_has_to
460 || span_more_than_a_single_line_of_the_source_text) {
462 while other people prefer to leave the operator at the end of the
465 if (the_beginning_of_a_very_long_expression_that_has_to ||
466 span_more_than_a_single_line_of_the_source_text) {
468 Both are valid, but we tend to use the latter more, unless the
469 expression gets fairly complex, in which case the former tends to
470 be easier to read. Again, just do not mix styles in the same part
471 of the code and mimic existing styles in the neighbourhood.
473 - When splitting a long logical line, with everything else being
474 equal, it is preferable to split after the operator at higher
475 level in the parse tree. That is, this is more preferable:
477 if (a_very_long_variable * that_is_used_in +
478 a_very_long_expression) {
483 if (a_very_long_variable *
484 that_is_used_in + a_very_long_expression) {
487 - Some clever tricks, like using the !! operator with arithmetic
488 constructs, can be extremely confusing to others. Avoid them,
489 unless there is a compelling reason to use them.
491 - Use the API. No, really. We have a strbuf (variable length
492 string), several arrays with the ALLOC_GROW() macro, a
493 string_list for sorted string lists, a hash map (mapping struct
494 objects) named "struct decorate", amongst other things.
496 - When you come up with an API, document its functions and structures
497 in the header file that exposes the API to its callers. Use what is
498 in "strbuf.h" as a model for the appropriate tone and level of
501 - The first #include in C files, except in platform specific compat/
502 implementations and sha1dc/, must be <git-compat-util.h>. This
503 header file insulates other header files and source files from
504 platform differences, like which system header files must be
505 included in what order, and what C preprocessor feature macros must
506 be defined to trigger certain features we expect out of the system.
507 A collorary to this is that C files should not directly include
508 system header files themselves.
510 There are some exceptions, because certain group of files that
511 implement an API all have to include the same header file that
512 defines the API and it is convenient to include <git-compat-util.h>
515 - the implementation of the built-in commands in the "builtin/"
516 directory that include "builtin.h" for the cmd_foo() prototype
519 - the test helper programs in the "t/helper/" directory that include
520 "t/helper/test-tool.h" for the cmd__foo() prototype definition,
522 - the xdiff implementation in the "xdiff/" directory that includes
523 "xdiff/xinclude.h" for the xdiff machinery internals,
525 - the unit test programs in "t/unit-tests/" directory that include
526 "t/unit-tests/test-lib.h" that gives them the unit-tests
529 - the source files that implement reftable in the "reftable/"
530 directory that include "reftable/system.h" for the reftable
533 are allowed to assume that they do not have to include
534 <git-compat-util.h> themselves, as it is included as the first
535 '#include' in these header files. These headers must be the first
536 header file to be "#include"d in them, though.
538 - A C file must directly include the header files that declare the
539 functions and the types it uses, except for the functions and types
540 that are made available to it by including one of the header files
541 it must include by the previous rule.
543 - If you are planning a new command, consider writing it in shell
544 or perl first, so that changes in semantics can be easily
545 changed and discussed. Many Git commands started out like
546 that, and a few are still scripts.
548 - Avoid introducing a new dependency into Git. This means you
549 usually should stay away from scripting languages not already
550 used in the Git core command set (unless your command is clearly
551 separate from it, such as an importer to convert random-scm-X
552 repositories to Git).
554 - When we pass <string, length> pair to functions, we should try to
555 pass them in that order.
557 - Use Git's gettext wrappers to make the user interface
558 translatable. See "Marking strings for translation" in po/README.
560 - Variables and functions local to a given source file should be marked
561 with "static". Variables that are visible to other source files
562 must be declared with "extern" in header files. However, function
563 declarations should not use "extern", as that is already the default.
565 - You can launch gdb around your program using the shorthand GIT_DEBUGGER.
566 Run `GIT_DEBUGGER=1 ./bin-wrappers/git foo` to simply use gdb as is, or
567 run `GIT_DEBUGGER="<debugger> <debugger-args>" ./bin-wrappers/git foo` to
568 use your own debugger and arguments. Example: `GIT_DEBUGGER="ddd --gdb"
569 ./bin-wrappers/git log` (See `wrap-for-bin.sh`.)
571 - The primary data structure that a subsystem 'S' deals with is called
572 `struct S`. Functions that operate on `struct S` are named
573 `S_<verb>()` and should generally receive a pointer to `struct S` as
574 first parameter. E.g.
578 void strbuf_add(struct strbuf *buf, ...);
580 void strbuf_reset(struct strbuf *buf);
586 void add_string(struct strbuf *buf, ...);
588 void reset_strbuf(struct strbuf *buf);
590 - There are several common idiomatic names for functions performing
591 specific tasks on a structure `S`:
593 - `S_init()` initializes a structure without allocating the
596 - `S_release()` releases a structure's contents without freeing the
599 - `S_clear()` is equivalent to `S_release()` followed by `S_init()`
600 such that the structure is directly usable after clearing it. When
601 `S_clear()` is provided, `S_init()` shall not allocate resources
602 that need to be released again.
604 - `S_free()` releases a structure's contents and frees the
609 - Most of the C guidelines above apply.
611 - We try to support Perl 5.8.1 and later ("use Perl 5.008001").
613 - use strict and use warnings are strongly preferred.
615 - Don't overuse statement modifiers unless using them makes the
616 result easier to follow.
619 do_this() unless (condition);
620 ... do something else ...
622 is more readable than:
628 ... do something else ...
630 *only* when the condition is so rare that do_this() will be almost
633 - We try to avoid assignments inside "if ()" conditions.
635 - Learn and use Git.pm if you need that functionality.
639 - We follow PEP-8 (https://peps.python.org/pep-0008/).
641 - As a minimum, we aim to be compatible with Python 2.7.
643 - Where required libraries do not restrict us to Python 2, we try to
644 also be compatible with Python 3.1 and later.
649 We make a distinction between a Git command's primary output and
650 output which is merely chatty feedback (for instance, status
651 messages, running transcript, or progress display), as well as error
652 messages. Roughly speaking, a Git command's primary output is that
653 which one might want to capture to a file or send down a pipe; its
654 chatty output should not interfere with these use-cases.
656 As such, primary output should be sent to the standard output stream
657 (stdout), and chatty output should be sent to the standard error
658 stream (stderr). Examples of commands which produce primary output
659 include `git log`, `git show`, and `git branch --list` which generate
660 output on the stdout stream.
662 Not all Git commands have primary output; this is often true of
663 commands whose main function is to perform an action. Some action
664 commands are silent, whereas others are chatty. An example of a
665 chatty action commands is `git clone` with its "Cloning into
666 '<path>'..." and "Checking connectivity..." status messages which it
667 sends to the stderr stream.
669 Error messages from Git commands should always be sent to the stderr
675 - Do not end error messages with a full stop.
677 - Do not capitalize the first word, only because it is the first word
678 in the message ("unable to open %s", not "Unable to open %s"). But
679 "SHA-3 not supported" is fine, because the reason the first word is
680 capitalized is not because it is at the beginning of the sentence,
681 but because the word would be spelled in capital letters even when
682 it appeared in the middle of the sentence.
684 - Say what the error is first ("cannot open %s", not "%s: cannot open")
687 Externally Visible Names
689 - For configuration variable names, follow the existing convention:
691 . The section name indicates the affected subsystem.
693 . The subsection name, if any, indicates which of an unbounded set
694 of things to set the value for.
696 . The variable name describes the effect of tweaking this knob.
698 The section and variable names that consist of multiple words are
699 formed by concatenating the words without punctuation marks (e.g. `-`),
700 and are broken using bumpyCaps in documentation as a hint to the
703 When choosing the variable namespace, do not use variable name for
704 specifying possibly unbounded set of things, most notably anything
705 an end user can freely come up with (e.g. branch names). Instead,
706 use subsection names or variable values, like the existing variable
707 branch.<name>.description does.
710 Writing Documentation:
712 Most (if not all) of the documentation pages are written in the
713 AsciiDoc format in *.txt files (e.g. Documentation/git.txt), and
714 processed into HTML and manpages (e.g. git.html and git.1 in the
717 The documentation liberally mixes US and UK English (en_US/UK)
718 norms for spelling and grammar, which is somewhat unfortunate.
719 In an ideal world, it would have been better if it consistently
720 used only one and not the other, and we would have picked en_US
721 (if you wish to correct the English of some of the existing
722 documentation, please see the documentation-related advice in the
723 Documentation/SubmittingPatches file).
725 In order to ensure the documentation is inclusive, avoid assuming
726 that an unspecified example person is male or female, and think
727 twice before using "he", "him", "she", or "her". Here are some
728 tips to avoid use of gendered pronouns:
730 - Prefer succinctness and matter-of-factly describing functionality
731 in the abstract. E.g.
733 `--short`:: Emit output in the short-format.
735 and avoid something like these overly verbose alternatives:
737 `--short`:: Use this to emit output in the short-format.
738 `--short`:: You can use this to get output in the short-format.
739 `--short`:: A user who prefers shorter output could....
740 `--short`:: Should a person and/or program want shorter output, he
743 This practice often eliminates the need to involve human actors in
744 your description, but it is a good practice regardless of the
745 avoidance of gendered pronouns.
747 - When it becomes awkward to stick to this style, prefer "you" when
748 addressing the hypothetical user, and possibly "we" when
749 discussing how the program might react to the user. E.g.
751 You can use this option instead of `--xyz`, but we might remove
752 support for it in future versions.
754 while keeping in mind that you can probably be less verbose, e.g.
756 Use this instead of `--xyz`. This option might be removed in future
759 - If you still need to refer to an example person that is
760 third-person singular, you may resort to "singular they" to avoid
761 "he/she/him/her", e.g.
763 A contributor asks their upstream to pull from them.
765 Note that this sounds ungrammatical and unnatural to those who
766 learned that "they" is only used for third-person plural, e.g.
767 those who learn English as a second language in some parts of the
770 Every user-visible change should be reflected in the documentation.
771 The same general rule as for code applies -- imitate the existing
777 Literal parts (e.g. use of command-line options, command names,
778 branch names, URLs, pathnames (files and directories), configuration and
779 environment variables) must be typeset as verbatim (i.e. wrapped with
784 `http://git.example.com`
790 An environment variable must be prefixed with "$" only when referring to its
791 value and not when referring to the variable itself, in this case there is
792 nothing to add except the backticks:
793 `GIT_DIR` is specified
794 `$GIT_DIR/hooks/pre-receive`
796 Word phrases enclosed in `backtick characters` are rendered literally
797 and will not be further expanded. The use of `backticks` to achieve the
798 previous rule means that literal examples should not use AsciiDoc
805 Placeholders are spelled in lowercase and enclosed in
806 angle brackets surrounded by underscores:
810 If a placeholder has multiple words, they are separated by dashes:
812 _<template-directory>_
814 A placeholder is not enclosed in backticks, as it is not a literal.
816 When needed, use a distinctive identifier for placeholders, usually
817 made of a qualification and a type:
821 When literal and placeholders are mixed, each markup is applied for
822 each sub-entity. If they are stuck, a special markup, called
823 unconstrained formatting is required.
824 Unconstrained formating for placeholders is __<like-this>__
825 Unconstrained formatting for literal formatting is ++like this++
828 __<directory>__++/.git++
829 ++remote.++__<name>__++.mirror++
831 caveat: ++ unconstrained format is not verbatim and may expand
832 content. Use Asciidoc escapes inside them.
836 Syntax grammar is formatted neither as literal nor as placeholder.
838 A few commented examples follow to provide reference when writing or
839 modifying command usage strings and synopsis sections in the manual
842 Possibility of multiple occurrences is indicated by three dots:
844 (One or more of <file>.)
846 Optional parts are enclosed in square brackets:
848 (Zero or more of <file>.)
850 ++--exec-path++[++=++__<path>__]
851 (Option with an optional argument. Note that the "=" is inside the
855 (Zero or more of <patch>. Note that the dots are inside, not
856 outside the brackets.)
858 Multiple alternatives are indicated with vertical bars:
860 [`--utf8` | `--no-utf8`]
862 Use spacing around "|" token(s), but not immediately after opening or
863 before closing a [] or () pair:
864 Do: [`-q` | `--quiet`]
865 Don't: [`-q`|`--quiet`]
867 Don't use spacing around "|" tokens when they're used to separate the
868 alternate arguments of an option:
869 Do: ++--track++[++=++(`direct`|`inherit`)]`
870 Don't: ++--track++[++=++(`direct` | `inherit`)]
872 Parentheses are used for grouping:
873 [(_<rev>_ | _<range>_)...]
874 (Any number of either <rev> or <range>. Parens are needed to make
875 it clear that "..." pertains to both <rev> and <range>.)
877 [(`-p` _<parent>_)...]
878 (Any number of option -p, each with one <parent> argument.)
880 `git remote set-head` _<name>_ (`-a` | `-d` | _<branch>_)
881 (One and only one of "-a", "-d" or "<branch>" _must_ (no square
882 brackets) be provided.)
884 And a somewhat more contrived example:
885 `--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]`
886 Here "=" is outside the brackets, because "--diff-filter=" is a
887 valid usage. "*" has its own pair of brackets, because it can
888 (optionally) be specified only when one or more of the letters is
892 Use 'git' (all lowercase) when talking about commands i.e. something
893 the user would type into a shell and use 'Git' (uppercase first letter)
894 when talking about the version control system and its properties.
896 If some place in the documentation needs to typeset a command usage
897 example with inline substitutions, it is fine to use +monospaced and
898 inline substituted text+ instead of `monospaced literal text`, and with
899 the former, the part that should not get substituted must be