summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mm/maint-hint-failed-merge' into maintJunio C Hamano2009-12-031-0/+4
|\
| * merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy2009-11-221-0/+4
* | Merge branch 'mo/maint-crlf-doc' into maintJunio C Hamano2009-12-031-3/+4
|\ \
| * | core.autocrlf documentation: mention the crlf attributeMatthew Ogilvie2009-11-161-3/+4
| |/
* | Merge branch 'mm/config-pathname-tilde-expand' into maintJunio C Hamano2009-12-031-2/+5
|\ \
| * | Documentation: avoid xmlto input errorJunio C Hamano2009-11-211-3/+3
| * | expand_user_path: expand ~ to $HOME, not to the actual homedir.Matthieu Moy2009-11-191-4/+5
| * | Expand ~ and ~user in core.excludesfile, commit.templateMatthieu Moy2009-11-171-1/+3
| |/
* | Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano2009-11-151-1/+5
|\ \
| * \ Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano2009-09-151-1/+5
| |\ \
| | * | core.whitespace: split trailing-space into blank-at-{eol,eof}Junio C Hamano2009-09-051-1/+3
| | * | apply --whitespace=warn/error: diagnose blank at EOFJunio C Hamano2009-09-041-0/+2
| * | | Merge branch 'np/maint-limit-delta-cache' into maintJunio C Hamano2009-08-211-3/+11
| |\ \ \
* | | | | receive-pack: run "gc --auto --quiet" and optionally "update-server-info"Junio C Hamano2009-10-211-0/+9
| |_|_|/ |/| | |
* | | | Documentation: clarify mergeoptions descriptionJonathan Nieder2009-10-091-1/+1
* | | | Merge branch 'jt/pushinsteadof'Junio C Hamano2009-09-131-0/+13
|\ \ \ \
| * | | | Add url.<base>.pushInsteadOf: URL rewriting for push onlyJosh Triplett2009-09-081-0/+13
* | | | | status: make "how to stage" messages optionalJeff King2009-09-111-0/+4
* | | | | push: make non-fast-forward help message configurableJeff King2009-09-111-0/+11
|/ / / /
* | | | Merge branch 'gb/apply-ignore-whitespace'Junio C Hamano2009-08-211-0/+8
|\ \ \ \
| * | | | git apply: option to ignore whitespace differencesGiuseppe Bilotta2009-08-051-0/+8
* | | | | Merge branch 'maint'Junio C Hamano2009-08-121-2/+2
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-121-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Change mentions of "git programs" to "git commands"Ori Avtalion2009-08-121-2/+2
| | * | config.txt: document add.ignore-errorsStephen Boyd2009-07-281-0/+5
* | | | don't let the delta cache grow unbounded in 'git repack'Nicolas Pitre2009-08-051-3/+11
|/ / /
* | | Documentation/config.txt: a variable can be defined on the section header lineNanako Shiraishi2009-07-251-1/+2
* | | List send-email config options in config.txt.Yann Dirson2009-07-221-0/+44
* | | Merge branch 'ml/http'Junio C Hamano2009-07-091-0/+6
|\ \ \
| * | | http.c: add http.sslCertPasswordProtected optionMark Lodato2009-06-181-0/+6
* | | | Merge branch 'maint'Junio C Hamano2009-07-081-1/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Documentation: update description of shell aliasesSitaram Chamarty2009-07-081-1/+3
* | | | Allow push and fetch urls to be differentMichael J Gruber2009-06-091-0/+3
| |/ / |/| |
* | | config.txt: document add.ignore-errorsStephen Boyd2009-05-311-0/+5
* | | Merge branch 'mh/show-branch-color'Junio C Hamano2009-05-181-0/+6
|\ \ \ | |/ / |/| |
| * | show-branch: color the commit status signsMarkus Heidelberg2009-04-221-0/+6
* | | Rename core.unreliableHardlinks to core.createObjectJohannes Schindelin2009-04-291-4/+8
* | | Add an option not to use link(src, dest) && unlink(src) when that is unreliableJohannes Schindelin2009-04-251-0/+5
* | | config.txt: Make configuration paragraph more consistentStephen Boyd2009-04-231-3/+3
* | | config.txt: clarify sentences in the configuration and syntax sectionsStephen Boyd2009-04-231-6/+6
* | | config.txt: add missing 'the's and make words pluralStephen Boyd2009-04-231-17/+17
* | | Documentation: use lowercase for shallow and deep threadingStephen Boyd2009-04-231-2/+2
* | | config.txt: add missing format.{subjectprefix,cc,attach} variablesStephen Boyd2009-04-231-0/+15
|/ /
* | Sync with 1.6.2.4Junio C Hamano2009-04-191-2/+4
|\ \
| * | Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'Johan Herland2009-04-181-2/+4
* | | Merge branch 'lt/bool-on-off'Junio C Hamano2009-04-181-1/+1
|\ \ \
| * | | Documentation: boolean value may be given by on/offMichał Kiedrowicz2009-04-171-1/+1
* | | | Merge branch 'da/difftool'Junio C Hamano2009-04-171-0/+21
|\ \ \ \
| * | | | difftool: add support for a difftool.prompt config variableDavid Aguilar2009-04-071-0/+3
| * | | | difftool: move 'git-difftool' out of contribDavid Aguilar2009-04-071-0/+18
| |/ / /
View Lorry Controller Status