summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mm/include-userpath'Junio C Hamano2012-04-291-1/+4
|\
| * config: expand tildes in include.path variableJeff King2012-04-291-1/+4
* | push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-191-2/+17
|/
* Merge branch 'maint'Junio C Hamano2012-03-041-3/+4
|\
| * http.proxy: also mention https_proxy and all_proxyClemens Buchacher2012-03-041-3/+4
* | Merge branch 'maint'Junio C Hamano2012-03-011-5/+7
|\ \ | |/
| * Documentation fixes in git-configLibor Pechacek2012-03-011-5/+7
* | config: add include directiveJeff King2012-02-171-0/+15
|/
* Sync with maintJunio C Hamano2012-01-101-1/+2
|\
| * Merge the attributes fix in from maint-1.6.7 branchJunio C Hamano2012-01-101-1/+2
| |\
| | * Merge the attributes fix in from maint-1.6.6 branchJunio C Hamano2012-01-101-1/+2
| | |\
| | | * Documentation: rerere's rr-cache auto-creation and rerere.enabledJunio C Hamano2012-01-101-1/+2
* | | | Merge branch 'jc/show-sig'Junio C Hamano2012-01-061-0/+11
|\ \ \ \
| * | | | gpg-interface: allow use of a custom GPG binaryjc/signed-commitJunio C Hamano2011-11-291-0/+11
* | | | | Sync with 1.7.8.3Junio C Hamano2012-01-061-4/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-061-4/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-061-4/+4
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Documentation: rerere.enabled is the primary way to configure rerereThomas Rast2012-01-061-4/+4
| | * | | Merge branch 'cn/eradicate-working-copy' into maintJunio C Hamano2011-10-261-3/+3
| | |\ \ \
| | * \ \ \ Merge branch 'maint-1.7.6' into maintJunio C Hamano2011-10-261-1/+2
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch 'tr/doc-note-rewrite' into maint-1.7.6Junio C Hamano2011-10-261-1/+2
| | | |\ \ \
| | | * \ \ \ Merge branch 'jn/doc-dashdash' into maintJunio C Hamano2011-09-111-1/+1
| | | |\ \ \ \
* | | | \ \ \ \ Merge branch 'jc/advice-doc'Junio C Hamano2011-12-201-11/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | advice: Document that they all default to truejc/advice-docJunio C Hamano2011-12-181-11/+8
* | | | | | | | Merge branch 'jk/credentials'Junio C Hamano2011-12-191-0/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | docs: end-user documentation for the credential subsystemJeff King2011-12-111-0/+23
| |/ / / / / / /
* | | | | | | | Merge branch 'ab/pull-rebase-config'Junio C Hamano2011-12-091-4/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | pull: introduce a pull.rebase option to enable --rebaseab/pull-rebase-configÆvar Arnfjörð Bjarmason2011-11-071-4/+16
* | | | | | | | Merge branch 'po/insn-editor'Junio C Hamano2011-10-211-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | "rebase -i": support special-purpose editor to edit insn sheetPeter Oberndorfer2011-10-171-0/+6
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'cn/doc-config-bare-subsection'Junio C Hamano2011-10-211-3/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Documentation: update [section.subsection] to reflect what git doescn/doc-config-bare-subsectionCarlos Martín Nieto2011-10-161-3/+4
* | | | | | | | Merge branch 'jn/gitweb-manpages'Junio C Hamano2011-10-181-0/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: Add gitweb config variables to git-config(1)Jakub Narebski2011-10-161-0/+17
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'cn/eradicate-working-copy'Junio C Hamano2011-10-051-3/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Remove 'working copy' from the documentation and C codeCarlos Martín Nieto2011-09-211-3/+3
| |/ / / / / /
* | | | | | | Merge branch 'tr/doc-note-rewrite'Junio C Hamano2011-10-051-1/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Documentation: basic configuration of notes.rewriteRefThomas Rast2011-09-131-1/+2
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'bw/log-all-ref-updates-doc' into maintJunio C Hamano2011-08-161-1/+3
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jc/fetch-pack-fsck-objects'Junio C Hamano2011-10-051-1/+14
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | transfer.fsckobjects: unify fetch/receive.fsckobjectsJunio C Hamano2011-09-041-2/+9
| * | | | | fetch.fsckobjects: verify downloaded objectsJunio C Hamano2011-09-041-0/+6
* | | | | | 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
|\ \ \ \ \