aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAge
* Merge branch 'maint'Junio C Hamano2012-09-17
|\
| * Documentation: indent-with-non-tab uses "equivalent tabs" not 8Wesley J. Landaker2012-09-17
* | Merge branch 'js/grep-patterntype-config'Junio C Hamano2012-08-27
|\ \ | |/ |/|
| * grep: add a grep.patternType configuration settingJ Smith2012-08-03
| * Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maintJunio C Hamano2012-07-30
| |\
* | \ Merge branch 'pg/maint-1.7.9-am-where-is-patch'Junio C Hamano2012-07-22
|\ \ \ | | |/ | |/|
| * | am: indicate where a failed patch is to be foundPaul Gortmaker2012-07-13
* | | Merge branch 'tb/sanitize-decomposed-utf-8-pathname'Junio C Hamano2012-07-13
|\ \ \
| * | | git on Mac OS and precomposed unicodeTorsten Bögershausen2012-07-08
| | |/ | |/|
* | | Merge branch 'mm/config-xdg'Junio C Hamano2012-07-09
|\ \ \
| * | | Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributesHuynh Khoi Nguyen Nguyen2012-06-25
| * | | Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignoreHuynh Khoi Nguyen Nguyen2012-06-25
| |/ /
* | | Fix formatting in git-config(1)Andreas Schwab2012-07-03
* | | wt-status.*: better advices for git status addedLucien Kong2012-06-14
|/ /
* | Merge branch 'nd/columns'Junio C Hamano2012-05-03
|\ \
| * | tag: add --columnNguyễn Thái Ngọc Duy2012-04-27
| * | status: add --columnNguyễn Thái Ngọc Duy2012-04-27
| * | branch: add --columnNguyễn Thái Ngọc Duy2012-04-27
| * | column: add dense layout supportNguyễn Thái Ngọc Duy2012-04-27
| * | column: add columnar layoutNguyễn Thái Ngọc Duy2012-04-27
| * | Add column layout skeleton and git-columnNguyễn Thái Ngọc Duy2012-04-27
* | | doc/config: fix inline literalsJeff King2012-05-03
* | | Merge branch 'jk/doc-asciidoc-inline-literal'Junio C Hamano2012-05-02
|\ \ \
| * | | docs: stop using asciidoc no-inline-literalJeff King2012-04-26
* | | | Merge branch 'mm/simple-push'Junio C Hamano2012-05-02
|\ \ \ \
| * | | | push.default doc: explain simple after upstreamJunio C Hamano2012-04-24
| * | | | push: document the future default change for push.default (matching -> simple)Matthieu Moy2012-04-24
| * | | | push: introduce new push.default mode "simple"Matthieu Moy2012-04-24
| * | | | Undocument deprecated alias 'push.default=tracking'Matthieu Moy2012-04-24
| * | | | Documentation: explain push.default option a bit moreMatthieu Moy2012-04-24
* | | | | Merge branch 'mm/include-userpath'Junio C Hamano2012-04-29
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | config: expand tildes in include.path variableJeff King2012-04-29
| |/ / /
* | | | push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-19
|/ / /
* | | Merge branch 'maint'Junio C Hamano2012-03-04
|\ \ \ | | |/ | |/|
| * | http.proxy: also mention https_proxy and all_proxyClemens Buchacher2012-03-04
* | | Merge branch 'maint'Junio C Hamano2012-03-01
|\ \ \ | |/ / | | / | |/ |/|
| * Documentation fixes in git-configLibor Pechacek2012-03-01
* | config: add include directiveJeff King2012-02-17
|/
* Sync with maintJunio C Hamano2012-01-10
|\
| * Merge the attributes fix in from maint-1.6.7 branchJunio C Hamano2012-01-10
| |\
| | * Merge the attributes fix in from maint-1.6.6 branchJunio C Hamano2012-01-10
| | |\
| | | * Documentation: rerere's rr-cache auto-creation and rerere.enabledJunio C Hamano2012-01-10
* | | | Merge branch 'jc/show-sig'Junio C Hamano2012-01-06
|\ \ \ \
| * | | | gpg-interface: allow use of a custom GPG binaryJunio C Hamano2011-11-29
* | | | | Sync with 1.7.8.3Junio C Hamano2012-01-06
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-06
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-06
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Documentation: rerere.enabled is the primary way to configure rerereThomas Rast2012-01-06
| | * | | Merge branch 'cn/eradicate-working-copy' into maintJunio C Hamano2011-10-26
| | |\ \ \
| | * \ \ \ Merge branch 'maint-1.7.6' into maintJunio C Hamano2011-10-26
| | |\ \ \ \ | | | | |/ / | | | |/| |