summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'wp/doc-filter-direction'Junio C Hamano2010-04-181-4/+4
|\
| * documentation: clarify direction of core.autocrlfWill Palmer2010-04-171-4/+4
* | Merge branch 'maint'Junio C Hamano2010-04-131-1/+1
|\ \ | |/
| * Documentation/config.txt: default gc.aggressiveWindow is 250, not 10Jay Soffian2010-04-131-1/+1
* | Merge branch 'tr/notes-display'Junio C Hamano2010-03-241-2/+51
|\ \
| * | notes: implement helpers needed for note copying during rewriteThomas Rast2010-03-121-0/+30
| * | Support showing notes from more than one notes treeThomas Rast2010-03-121-2/+21
* | | Merge branch 'ml/color-grep'Junio C Hamano2010-03-201-3/+23
|\ \ \
| * | | grep: Colorize selected, context, and function linesMark Lodato2010-03-081-0/+6
| * | | grep: Colorize filename, line number, and separatorMark Lodato2010-03-081-3/+17
* | | | Merge branch 'maint'Junio C Hamano2010-03-171-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Documentation: receive.denyCurrentBranch defaults to 'refuse'Thomas Rast2010-03-171-1/+1
| * | | Merge branch 'jc/checkout-detached' into maintJunio C Hamano2010-03-081-0/+5
| |\ \ \
* | \ \ \ Merge branch 'sd/init-template'Junio C Hamano2010-03-101-0/+4
|\ \ \ \ \
| * | | | | Add a "TEMPLATE DIRECTORY" section to git-init[1].Steven Drake2010-02-171-0/+4
* | | | | | Merge branch 'sh/am-keep-cr'Junio C Hamano2010-03-101-0/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | git-am: Add am.keepcr and --no-keep-cr to override itStefan-W. Hahn2010-02-281-0/+7
* | | | | | Merge branch 'maint'Junio C Hamano2010-02-281-3/+1
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Remove reference to GREP_COLORS from documentationMark Lodato2010-02-281-3/+1
| |/ / /
* | | | Merge branch 'jc/checkout-detached'Junio C Hamano2010-02-211-0/+5
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Reword "detached HEAD" notificationJunio C Hamano2010-01-291-0/+5
* | | make --max-pack-size argument to 'git pack-object' count in bytesNicolas Pitre2010-02-031-4/+7
* | | Merge branch 'sp/maint-fast-import-large-blob' into sp/fast-import-large-blobJunio C Hamano2010-02-011-0/+14
|\ \ \ | |/ / |/| |
| * | fast-import: Stream very large blobs directly to packShawn O. Pearce2010-02-011-0/+14
* | | Documentation: add missing :: in config.txtThomas Rast2010-01-241-1/+1
| |/ |/|
* | Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano2010-01-201-39/+39
|\ \
| * | Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-101-36/+36
| * | Documentation: format full commands in typewriter fontThomas Rast2010-01-101-6/+6
* | | Merge branch 'jc/grep-lookahead'Junio C Hamano2010-01-201-8/+0
|\ \ \
| * | | grep: rip out support for external grepJunio C Hamano2010-01-131-8/+0
* | | | Merge branch 'mm/conflict-advice'Junio C Hamano2010-01-201-0/+4
|\ \ \ \
| * | | | Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-121-0/+4
| |/ / /
* | | | Merge branch 'jk/warn-author-committer-after-commit'Junio C Hamano2010-01-201-0/+4
|\ \ \ \
| * | | | commit: allow suppression of implicit identity adviceJeff King2010-01-141-0/+4
| |/ / /
* | | | Merge branch 'jh/commit-status'Junio C Hamano2010-01-171-0/+5
|\ \ \ \
| * | | | commit: support commit.status, --status, and --no-statusJames P. Howard, II2010-01-131-0/+5
| |/ / /
* | | | Merge branch 'nd/sparse'Junio C Hamano2010-01-131-0/+4
|\ \ \ \
| * | | | unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkoutNguyễn Thái Ngọc Duy2009-08-231-0/+4
* | | | | Merge branch 'tr/http-updates'Junio C Hamano2010-01-101-0/+6
|\ \ \ \ \
| * | | | | Remove http.authAnyJunio C Hamano2009-12-291-7/+0
| * | | | | Add an option for using any HTTP authentication scheme, not only basicMartin Storsjö2009-11-271-0/+7
| * | | | | http: maintain curl sessionsTay Ray Chuan2009-11-271-0/+6
* | | | | | Merge branch 'maint'Junio C Hamano2010-01-101-13/+10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Documentation: tiny git config manual tweaksJonathan Nieder2010-01-091-4/+4
| * | | | Documentation: git gc packs refs by default nowJonathan Nieder2010-01-091-9/+6
* | | | | Merge branch 'maint'Junio C Hamano2009-12-301-8/+15
|\ \ \ \ \ | |/ / / /
| * | | | Documentation: always respect core.worktree if setNguyễn Thái Ngọc Duy2009-12-291-8/+15
| | |_|/ | |/| |
* | | | Merge branch 'sr/vcs-helper'Junio C Hamano2009-12-261-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Add a config option for remotes to specify a foreign vcsDaniel Barkalow2009-11-171-0/+4
* | | | Give the hunk comment its own colorBert Wesarg2009-11-281-4/+4
| |/ / |/| |