summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Add -y/--no-prompt option to mergetoolCharles Bailey2008-11-141-0/+3
* receive-pack: detect push to current branch of non-bare repoJeff King2008-11-091-0/+9
* Introduce receive.denyDeletesJan Krüger2008-11-021-0/+4
* Merge branch 'ml/cygwin-filemode'Junio C Hamano2008-10-191-1/+3
|\
| * compat/cygwin.c - Use cygwin's stat if core.filemode == trueMark Levedahl2008-10-131-1/+3
* | format-patch: autonumber by defaultBrian Gernhardt2008-10-181-4/+5
|/
* cygwin: Use native Win32 API for statDmitry Potapov2008-09-301-0/+9
* Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-291-0/+8
|\
| * merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-301-0/+8
* | Merge branch 'maint'Shawn O. Pearce2008-09-261-2/+11
|\ \
| * | Documentation: clarify the details of overriding LESS via core.pagerChris Frey2008-09-261-2/+11
* | | Merge branch 'jc/diff-prefix'Junio C Hamano2008-09-181-0/+16
|\ \ \
| * | | diff: vary default prefix depending on what are comparedJunio C Hamano2008-08-301-0/+16
| | |/ | |/|
* | | Merge branch 'ar/autospell'Junio C Hamano2008-09-071-0/+9
|\ \ \
| * | | Add help.autocorrect to enable/disable autocorrectingAlex Riesen2008-08-311-0/+9
* | | | Merge branch 'maint'Junio C Hamano2008-08-311-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | config.txt: Add missing colons after option nameTeemu Likonen2008-08-301-1/+1
| |/
* | Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano2008-08-241-5/+12
|\ \ | |/
| * Documentation: clarify pager configurationJonathan Nieder2008-08-241-2/+7
| * Documentation: clarify pager.<cmd> configurationJonathan Nieder2008-08-241-3/+5
* | add boolean diff.suppress-blank-empty config optionJim Meyering2008-08-191-0/+4
|/
* Documentation: document the pager.* configuration settingMiklos Vajna2008-08-161-0/+5
* Documentation: typos / spelling fixesMike Ralphson2008-08-051-1/+1
* Make use of stat.ctime configurableAlex Riesen2008-07-281-0/+7
* Documentation: fix diff.external exampleAnders Melchiorsen2008-07-271-4/+6
* Documentation: clarify how to disable elements in core.whitespaceJunio C Hamano2008-07-251-1/+2
* Documentation: fix broken "linkgit" linksEric Hanchrow2008-07-081-1/+1
* Merge branch 'jc/rerere'Junio C Hamano2008-07-071-0/+5
|\
| * rerere.autoupdateJunio C Hamano2008-06-221-0/+5
* | manpages: italicize git subcommand names (which were in teletype font)Jonathan Nieder2008-07-051-4/+4
* | manpages: italicize git command names (which were in teletype font)Jonathan Nieder2008-07-051-27/+27
* | manpages: italicize command namesJonathan Nieder2008-07-051-2/+2
* | Documentation: more "git-" versus "git " changesJonathan Nieder2008-07-051-26/+26
* | Documentation: rewrap to prepare for "git-" vs "git " changeJonathan Nieder2008-07-051-2/+2
* | Merge branch 'np/pack-default'Junio C Hamano2008-07-011-5/+17
|\ \
| * | pack.indexversion config option now defaults to 2Nicolas Pitre2008-06-251-3/+11
| * | repack.usedeltabaseoffset config option now defaults to "true"Nicolas Pitre2008-06-251-2/+6
* | | Documentation: remove {show,whatchanged}.difftree config optionsOlivier Marin2008-06-281-8/+0
* | | Merge branch 'lt/config-fsync'Junio C Hamano2008-06-251-0/+8
|\ \ \ | |/ / |/| |
| * | Add config option to enable 'fsync()' of object filesLinus Torvalds2008-06-181-0/+8
| |/
* | Add configuration option for default untracked files modeMarius Storm-Olsen2008-06-091-0/+19
|/
* Clearify the documentation for core.ignoreStatMarius Storm-Olsen2008-05-311-4/+7
* Merge branch 'mo/cvsserver'Junio C Hamano2008-05-251-6/+20
|\
| * git-cvsserver: add ability to guess -kb from contentsMatthew Ogilvie2008-05-161-5/+8
| * implement gitcvs.usecrlfattrMatthew Ogilvie2008-05-161-6/+17
* | Add log.date config variableHeikki Orsila2008-05-231-0/+6
* | Updated status to show 'Not currently on any branch' in redChris Parsons2008-05-221-2/+4
|/
* Allow tracking branches to set up rebase by default.Dustin Sallings2008-05-111-0/+15
* Merge branch 'maint'Junio C Hamano2008-05-081-1/+2
|\
| * Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-05-081-1/+2
| |\