summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2010-07-151-0/+9
|\
| * Documentation: add submodule.* to the big configuration variable listJonathan Nieder2010-07-151-0/+9
* | Merge branch 'maint'Junio C Hamano2010-07-131-2/+4
|\ \ | |/
| * format-patch: document the format.to configuration settingMiklos Vajna2010-07-131-2/+4
| * Merge branch 'jn/notes-doc' into maintJunio C Hamano2010-06-211-11/+5
| |\
| * \ Merge branch 'bg/send-email-smtpdomain' into maintJunio C Hamano2010-06-161-0/+1
| |\ \
* | \ \ Merge branch 'ar/decorate-color'Junio C Hamano2010-06-301-0/+5
|\ \ \ \
| * | | | Allow customizable commit decorations colorsNazri Ramliy2010-06-241-0/+5
* | | | | Merge branch 'sb/format-patch-signature'Junio C Hamano2010-06-221-0/+6
|\ \ \ \ \
| * | | | | format-patch: Add a signature option (--signature)Stephen Boyd2010-06-161-0/+6
* | | | | | Merge branch 'eb/core-eol'Junio C Hamano2010-06-211-22/+31
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add "core.eol" config variableEyvind Bernhardsen2010-06-061-14/+21
| * | | | | Rename the "crlf" attribute "text"Eyvind Bernhardsen2010-05-191-7/+9
| * | | | | Add per-repository eol normalizationEyvind Bernhardsen2010-05-191-2/+2
* | | | | | Merge branch 'ec/diff-noprefix-config'Junio C Hamano2010-06-181-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | diff: add configuration option for disabling diff prefixes.Eli Collins2010-05-181-0/+2
* | | | | | Merge branch 'jn/notes-doc'Junio C Hamano2010-06-131-11/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Documentation/notes: document format of notes treesJonathan Nieder2010-05-081-11/+5
* | | | | | Merge branch 'wp/pretty-enhancement'Junio C Hamano2010-06-131-0/+10
|\ \ \ \ \ \
| * | | | | | pretty: add aliases for pretty formatsWill Palmer2010-05-031-0/+10
| |/ / / / /
* | | | | | Merge branch 'maint'Junio C Hamano2010-05-311-0/+7
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'maint-1.7.0' into maintJunio C Hamano2010-05-311-0/+7
| |\ \ \ \ \
| | * | | | | Documentation/config: describe status.submodulesummaryMichael J Gruber2010-05-281-0/+7
* | | | | | | Merge branch 'st/remote-tags-no-tags'Junio C Hamano2010-05-211-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Honor "tagopt = --tags" configuration optionSamuel Tardieu2010-04-191-1/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jc/maint-no-reflog-expire-unreach-for-head'Junio C Hamano2010-05-211-2/+8
|\ \ \ \ \ \ \
| * | | | | | | Document gc.<pattern>.reflogexpire variablesJunio C Hamano2010-04-141-2/+8
* | | | | | | | Merge branch 'maint'Junio C Hamano2010-05-181-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | Documentation: fix minor inconsistencyMichael J Gruber2010-05-181-1/+1
* | | | | | | Merge branch 'bg/send-email-smtpdomain'Junio C Hamano2010-05-081-0/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | send-email: Cleanup smtp-domain and add configBrian Gernhardt2010-04-101-0/+1
* | | | | | | Merge branch 'sd/log-decorate'Junio C Hamano2010-05-081-0/+7
|\ \ \ \ \ \ \
| * | | | | | | Add `log.decorate' configuration variable.Steven Drake2010-02-171-0/+7
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'cw/ws-indent-with-tab'Junio C Hamano2010-05-081-0/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | whitespace: add tab-in-indent error classChris Webb2010-04-021-0/+2
* | | | | | | Documentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRefLeif Arne Storset2010-05-071-4/+4
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'wp/doc-filter-direction'Junio C Hamano2010-04-181-4/+4
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | documentation: clarify direction of core.autocrlfWill Palmer2010-04-171-4/+4
* | | | | | Merge branch 'maint'Junio C Hamano2010-04-131-1/+1
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Documentation/config.txt: default gc.aggressiveWindow is 250, not 10Jay Soffian2010-04-131-1/+1
* | | | | Merge branch 'tr/notes-display'Junio C Hamano2010-03-241-2/+51
|\ \ \ \ \
| * | | | | notes: implement helpers needed for note copying during rewriteThomas Rast2010-03-121-0/+30
| * | | | | Support showing notes from more than one notes treeThomas Rast2010-03-121-2/+21
* | | | | | Merge branch 'ml/color-grep'Junio C Hamano2010-03-201-3/+23
|\ \ \ \ \ \
| * | | | | | grep: Colorize selected, context, and function linesMark Lodato2010-03-081-0/+6
| * | | | | | grep: Colorize filename, line number, and separatorMark Lodato2010-03-081-3/+17
* | | | | | | Merge branch 'maint'Junio C Hamano2010-03-171-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Documentation: receive.denyCurrentBranch defaults to 'refuse'Thomas Rast2010-03-171-1/+1
| * | | | | Merge branch 'jc/checkout-detached' into maintJunio C Hamano2010-03-081-0/+5
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'sd/init-template'Junio C Hamano2010-03-101-0/+4
|\ \ \ \ \ \ \