summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-121-0/+4
* Give the hunk comment its own colorBert Wesarg2009-11-281-4/+4
* Merge branch 'mm/maint-hint-failed-merge'Junio C Hamano2009-11-231-0/+4
|\
| * merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy2009-11-221-0/+4
* | Merge branch 'bg/fetch-multi'Junio C Hamano2009-11-231-1/+7
|\ \
| * | Add the configuration option skipFetchAllBjörn Gustavsson2009-11-101-1/+7
| |/
* | config documentation: some configs are auto-set by git-initMatthew Ogilvie2009-11-221-2/+22
* | Merge branch 'mo/maint-crlf-doc'Junio C Hamano2009-11-221-3/+4
|\ \
| * | core.autocrlf documentation: mention the crlf attributeMatthew Ogilvie2009-11-161-3/+4
| |/
* | Merge branch 'mm/config-pathname-tilde-expand'Junio C Hamano2009-11-221-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 'jh/notes' (early part)Junio C Hamano2009-11-201-0/+13
|\ \
| * | Introduce commit notesJohannes Schindelin2009-10-191-0/+13
| |/
* | Merge branch 'sp/smart-http'Junio C Hamano2009-11-201-0/+8
|\ \
| * | Smart push over HTTP: client sideShawn O. Pearce2009-11-041-0/+8
| |/
* | Merge branch 'jn/editor-pager'Junio C Hamano2009-11-201-3/+1
|\ \
| * | add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"Jonathan Nieder2009-11-131-3/+1
* | | Merge branch 'fc/doc-fast-forward'Junio C Hamano2009-11-151-1/+1
|\ \ \ | |/ / |/| |
| * | Use 'fast-forward' all over the placeFelipe Contreras2009-10-241-1/+1
| |/
* | Merge branch 'jc/receive-pack-auto'Junio C Hamano2009-10-251-0/+9
|\ \
| * | receive-pack: run "gc --auto --quiet" and optionally "update-server-info"Junio C Hamano2009-10-211-0/+9
| |/
* | Merge branch 'jc/maint-blank-at-eof'Junio C Hamano2009-10-171-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
| |\ \
* | | | 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
View Lorry Controller Status