summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bw/log-all-ref-updates-doc'Junio C Hamano2011-07-221-1/+3
|\
| * Documentation: clearly specify what refs are honored by core.logAllRefUpdatesBert Wesarg2011-07-121-1/+3
* | Merge branch 'jn/doc-dashdash'Junio C Hamano2011-07-131-1/+1
|\ \
| * \ Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdashJunio C Hamano2011-06-291-1/+1
| |\ \
| | * | Documentation: quote double-dash for AsciiDocJonathan Nieder2011-06-291-1/+1
* | | | http: pass http.cookiefile using CURLOPT_COOKIEFILEDuncan Brown2011-06-031-0/+8
|/ / /
* | | Add log.abbrevCommit config variableJay Soffian2011-05-181-0/+5
* | | Merge branch 'ci/commit--interactive-atomic'Junio C Hamano2011-05-161-3/+4
|\ \ \
| * | | Add commit to list of config.singlekey commandsConrad Irwin2011-05-091-3/+4
* | | | Merge branch 'vh/config-interactive-singlekey-doc'Junio C Hamano2011-05-111-2/+3
|\ \ \ \ | |/ / /
| * | | config.txt: 'interactive.singlekey; is used by...Valentin Haenel2011-05-051-2/+3
* | | | Merge branch 'mg/alias-expose-prefix'Junio C Hamano2011-05-061-0/+2
|\ \ \ \
| * | | | handle_alias: provide GIT_PREFIX to !aliasMichael J Gruber2011-04-271-0/+2
| |/ / /
* | | | Merge branch 'mg/diff-uiconfig-doc'Junio C Hamano2011-05-061-8/+19
|\ \ \ \
| * | | | config.txt,diff-options.txt: porcelain vs. plumbing for color.diffMichael J Gruber2011-04-271-8/+19
| |/ / /
* | | | Merge branch 'mz/rebase'Junio C Hamano2011-04-281-1/+1
|\ \ \ \
| * | | | rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk2011-02-101-1/+1
* | | | | Merge branch 'rr/doc-content-type'Junio C Hamano2011-04-271-62/+11
|\ \ \ \ \
| * | | | | Documentation: Move diff.<driver>.* from config.txt to diff-config.txtRamkumar Ramachandra2011-04-061-62/+1
| * | | | | Documentation: Add filter.<driver>.* to configRamkumar Ramachandra2011-04-061-0/+10
| | |_|/ / | |/| | |
* | | | | Merge branch 'jc/pack-objects-bigfile'Junio C Hamano2011-04-271-2/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Teach core.bigfilethreashold to pack-objectsJunio C Hamano2011-04-051-2/+0
| | |/ / | |/| |
* | | | Merge branch 'maint'Junio C Hamano2011-04-041-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Documentation: trivial grammar fix in core.worktree descriptionSZEDER Gábor2011-04-041-1/+1
| * | | Merge branch 'lt/default-abbrev' into maintJunio C Hamano2011-04-031-0/+6
| |\ \ \
* | \ \ \ Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano2011-04-041-4/+8
|\ \ \ \ \
| * | | | | Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' optionJens Lehmann2011-03-091-1/+1
| * | | | | config: teach the fetch.recurseSubmodules option the 'on-demand' valueJens Lehmann2011-03-091-3/+7
| | |_|/ / | |/| | |
* | | | | Merge branch 'jr/grep-en-config'Junio C Hamano2011-04-011-0/+6
|\ \ \ \ \
| * | | | | grep: allow -E and -n to be turned on by default via configurationJoe Ratterman2011-03-301-0/+6
* | | | | | Merge branch 'maint'Junio C Hamano2011-03-301-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Documentation/config.txt: make truth value of numbers more explicitCarlos Martín Nieto2011-03-301-1/+1
| * | | | Merge branch 'jh/push-default-upstream-configname' into maintJunio C Hamano2011-03-161-1/+2
| |\ \ \ \
* | \ \ \ \ Merge branch 'lt/default-abbrev'Junio C Hamano2011-03-231-0/+6
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Rename core.abbrevlength back to core.abbrevJunio C Hamano2011-03-201-1/+1
| * | | | | Make the default abbrev length configurableLinus Torvalds2011-03-111-0/+6
| | |_|/ / | |/| | |
* | | | | Merge branch 'maint'Junio C Hamano2011-03-101-9/+0
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"Junio C Hamano2011-03-101-9/+0
| |/ /
* | | push.default: Rename 'tracking' to 'upstream'Johan Herland2011-02-161-1/+2
|/ /
* | Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecaseJunio C Hamano2011-01-241-8/+17
* | Fix typos in the documentationRalf Wildenhues2011-01-041-2/+2
* | Merge branch 'nd/setup'Junio C Hamano2010-12-281-15/+8
|\ \
| * | Revert "Documentation: always respect core.worktree if set"Nguyễn Thái Ngọc Duy2010-12-221-15/+8
* | | Merge branch 'maint'Junio C Hamano2010-12-191-1/+1
|\ \ \
| * | | Fix typo in git-gc document.Jiang Xin2010-12-171-1/+1
* | | | Merge branch 'jl/fetch-submodule-recursive'Junio C Hamano2010-12-161-0/+12
|\ \ \ \
| * | | | Submodules: Add the "fetchRecurseSubmodules" config optionJens Lehmann2010-11-121-0/+7
| * | | | Add the 'fetch.recurseSubmodules' config settingJens Lehmann2010-11-121-0/+5
* | | | | Merge branch 'aa/status-hilite-branch'Junio C Hamano2010-12-161-1/+2
|\ \ \ \ \
| * | | | | status: show branchname with a configurable colorAleksi Aalto2010-11-291-1/+2