summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rt/commit-cleanup-config'Junio C Hamano2013-01-201-0/+9
|\
| * commit: make default of "cleanup" option configurableRalf Thielow2013-01-101-0/+9
* | Merge branch 'ap/log-mailmap'Junio C Hamano2013-01-201-0/+4
|\ \
| * | log: add log.mailmap configuration optionAntoine Pelisse2013-01-101-0/+4
* | | Merge branch 'ss/help-htmlpath-config-doc'Junio C Hamano2013-01-181-0/+6
|\ \ \ | |_|/ |/| |
| * | config.txt: Document help.htmlpath config parameterSebastian Staudt2013-01-151-0/+6
* | | Merge branch 'nd/maint-branch-desc-doc'Junio C Hamano2013-01-091-0/+6
|\ \ \
| * | | config.txt: a few lines about branch.<name>.descriptionNguyễn Thái Ngọc Duy2013-01-011-0/+6
| |/ /
* | | Merge branch 'wk/submodule-update-remote'Junio C Hamano2013-01-051-0/+6
|\ \ \
| * | | submodule update: add --remote for submodule's upstream changesW. Trevor King2012-12-191-0/+6
* | | | Merge branch 'jk/mailmap-from-blob'Junio C Hamano2013-01-051-0/+8
|\ \ \ \
| * | | | mailmap: default mailmap.blob in bare repositoriesJeff King2012-12-131-3/+5
| * | | | mailmap: support reading mailmap from blobsJeff King2012-12-121-0/+6
| | |_|/ | |/| |
* | | | Merge branch 'cr/push-force-tag-update'Junio C Hamano2013-01-051-3/+7
|\ \ \ \ | |/ / / |/| | |
| * | | push: allow already-exists advice to be disabledChris Rorvick2012-12-031-2/+6
| * | | push: rename config variable for more general useChris Rorvick2012-12-031-1/+1
* | | | Merge branch 'mm/status-push-pull-advise'Junio C Hamano2012-12-041-2/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | document that statusHints affects git checkoutMatthieu Moy2012-12-041-2/+3
* | | | Documentation: move diff.wordRegex from config.txt to diff-config.txtRamkumar Ramachandra2012-11-181-6/+0
| |/ / |/| |
* | | Merge branch 'pp/maint-doc-pager-config'Jeff King2012-11-041-4/+4
|\ \ \ | |/ / |/| |
| * | Documentation: improve the example of overriding LESS via core.pagerPatrick Palka2012-10-291-4/+4
| |/
* | Merge branch 'maint'Junio C Hamano2012-09-171-2/+3
|\ \ | |/
| * Documentation: indent-with-non-tab uses "equivalent tabs" not 8Wesley J. Landaker2012-09-171-2/+3
* | Merge branch 'js/grep-patterntype-config'Junio C Hamano2012-08-271-1/+9
|\ \ | |/ |/|
| * grep: add a grep.patternType configuration settingJ Smith2012-08-031-1/+9
| * Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maintJunio C Hamano2012-07-301-0/+3
| |\
* | \ Merge branch 'pg/maint-1.7.9-am-where-is-patch'Junio C Hamano2012-07-221-0/+3
|\ \ \ | | |/ | |/|
| * | am: indicate where a failed patch is to be foundPaul Gortmaker2012-07-131-0/+3
* | | Merge branch 'tb/sanitize-decomposed-utf-8-pathname'Junio C Hamano2012-07-131-0/+9
|\ \ \
| * | | git on Mac OS and precomposed unicodeTorsten Bögershausen2012-07-081-0/+9
| | |/ | |/|
* | | Merge branch 'mm/config-xdg'Junio C Hamano2012-07-091-2/+6
|\ \ \
| * | | Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributesHuynh Khoi Nguyen Nguyen2012-06-251-1/+3
| * | | Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignoreHuynh Khoi Nguyen Nguyen2012-06-251-1/+3
| |/ /
* | | Fix formatting in git-config(1)Andreas Schwab2012-07-031-7/+9
* | | wt-status.*: better advices for git status addedLucien Kong2012-06-141-3/+4
|/ /
* | Merge branch 'nd/columns'Junio C Hamano2012-05-031-0/+38
|\ \
| * | tag: add --columnNguyễn Thái Ngọc Duy2012-04-271-0/+4
| * | status: add --columnNguyễn Thái Ngọc Duy2012-04-271-0/+4
| * | branch: add --columnNguyễn Thái Ngọc Duy2012-04-271-0/+4
| * | column: add dense layout supportNguyễn Thái Ngọc Duy2012-04-271-0/+4
| * | column: add columnar layoutNguyễn Thái Ngọc Duy2012-04-271-0/+4
| * | Add column layout skeleton and git-columnNguyễn Thái Ngọc Duy2012-04-271-0/+18
* | | doc/config: fix inline literalsJeff King2012-05-031-2/+2
* | | Merge branch 'jk/doc-asciidoc-inline-literal'Junio C Hamano2012-05-021-18/+18
|\ \ \
| * | | docs: stop using asciidoc no-inline-literalJeff King2012-04-261-18/+18
* | | | Merge branch 'mm/simple-push'Junio C Hamano2012-05-021-4/+22
|\ \ \ \
| * | | | push.default doc: explain simple after upstreamJunio C Hamano2012-04-241-4/+4
| * | | | push: document the future default change for push.default (matching -> simple)Matthieu Moy2012-04-241-2/+6
| * | | | push: introduce new push.default mode "simple"Matthieu Moy2012-04-241-1/+4
| * | | | Undocument deprecated alias 'push.default=tracking'Matthieu Moy2012-04-241-1/+0