summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/colors-fix' into maintJunio C Hamano2014-12-221-0/+4
|\
| * docs: describe ANSI 256-color modeJeff King2014-11-201-0/+4
* | Sync with v2.1.4Junio C Hamano2014-12-171-0/+11
|\ \
| * \ Sync with v2.0.5Junio C Hamano2014-12-171-0/+11
| |\ \ | | |/ | |/|
| | * Sync with v1.9.5Junio C Hamano2014-12-171-0/+11
| | |\
| | | * Sync with v1.8.5.6Junio C Hamano2014-12-171-0/+11
| | | |\
| | | | * read-cache: optionally disallow NTFS .git variantsJohannes Schindelin2014-12-171-0/+6
| | | | * read-cache: optionally disallow HFS+ .git variantsJeff King2014-12-171-0/+5
* | | | | Sync with maintJunio C Hamano2014-11-101-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Documentation/config.txt: fix minor typoThomas Quinot2014-11-101-1/+1
| * | | | config.txt: fix typoNicolas Dermine2014-11-101-1/+1
* | | | | Documentation: typofixesThomas Ackermann2014-11-041-5/+5
* | | | | Merge branch 'rs/grep-color-words'Junio C Hamano2014-10-311-1/+5
|\ \ \ \ \
| * | | | | grep: add color.grep.matchcontext and color.grep.matchselectedrs/grep-color-wordsRené Scharfe2014-10-281-1/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rb/pack-window-memory-config-doc'Junio C Hamano2014-10-291-4/+5
|\ \ \ \ \
| * | | | | config.txt: pack.windowmemory limit applies per-threadrb/pack-window-memory-config-docRobert de Bath2014-10-281-4/+5
* | | | | | Merge branch 'tb/core-filemode-doc'Junio C Hamano2014-10-241-6/+19
|\ \ \ \ \ \
| * | | | | | core.filemode may need manual actiontb/core-filemode-docTorsten Bögershausen2014-10-191-6/+19
| |/ / / / /
* | | | | | Merge branch 'da/mergetool-meld'Junio C Hamano2014-10-211-0/+9
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | mergetools/meld: make usage of `--output` configurable and more robustda/mergetool-meldDavid Aguilar2014-10-161-0/+9
| |/ / / /
* | | | | Merge branch 'da/mergetool-temporary-directory'Junio C Hamano2014-10-211-0/+6
|\ \ \ \ \
| * | | | | mergetool: add an option for writing to a temporary directoryDavid Aguilar2014-10-161-0/+6
| | |_|/ / | |/| | |
| * | | | Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano2014-06-251-2/+6
| |\ \ \ \
* | \ \ \ \ Merge branch 'jc/push-cert'Junio C Hamano2014-10-081-0/+19
|\ \ \ \ \ \
| * | | | | | signed push: allow stale nonce in stateless modeJunio C Hamano2014-09-171-0/+13
| * | | | | | signed push: fortify against replay attacksJunio C Hamano2014-09-171-6/+6
| * | | | | | push: the beginning of "git push --signed"Junio C Hamano2014-09-151-0/+6
| | |_|/ / / | |/| | | |
* | | | | | diff --stat: mark any file larger than core.bigfilethreshold binaryNguyễn Thái Ngọc Duy2014-08-181-1/+2
|/ / / / /
* | | | | Merge branch 'jk/tag-sort'Junio C Hamano2014-07-231-0/+5
|\ \ \ \ \
| * | | | | tag: support configuring --sort via .gitconfigjk/tag-sortJacob Keller2014-07-171-0/+5
* | | | | | Merge branch 'jk/repack-pack-writebitmaps-config'Junio C Hamano2014-06-251-7/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | repack: introduce repack.writeBitmaps config optionJeff King2014-06-101-7/+10
* | | | | | Merge branch 'sh/enable-preloadindex'Junio C Hamano2014-06-161-2/+2
|\ \ \ \ \ \
| * | | | | | environment.c: enable core.preloadindex by defaultsh/enable-preloadindexSteve Hoelzer2014-06-031-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jm/format-patch-mail-sig'Junio C Hamano2014-06-161-0/+4
|\ \ \ \ \ \
| * | | | | | format-patch: add "--signature-file=<file>" optionjm/format-patch-mail-sigJeremiah Mahler2014-05-271-0/+4
| |/ / / / /
* | | | | | Merge branch 'jl/status-added-submodule-is-never-ignored'Junio C Hamano2014-06-161-2/+6
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | status/commit: show staged submodules regardless of ignore configJens Lehmann2014-04-071-2/+6
* | | | | | Merge branch 'jj/command-line-adjective'Junio C Hamano2014-06-061-5/+5
|\ \ \ \ \ \
| * | | | | | Documentation: use "command-line" when used as a compound adjective, and fix ...jj/command-line-somethingjj/command-line-adjectiveJason St. John2014-05-211-5/+5
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'nd/status-auto-comment-char'Junio C Hamano2014-06-061-0/+3
|\ \ \ \ \ \
| * | | | | | commit: allow core.commentChar=auto for character auto selectionnd/status-auto-comment-charNguyễn Thái Ngọc Duy2014-05-191-0/+3
| |/ / / / /
* | | | | | Merge branch 'dk/raise-core-deltabasecachelimit'Junio C Hamano2014-06-061-1/+1
|\ \ \ \ \ \
| * | | | | | Bump core.deltaBaseCacheLimit to 96mdk/raise-core-deltabasecachelimitDavid Kastrup2014-05-061-1/+1
| |/ / / / /
* | | | | | Merge branch 'mm/pager-less-sans-S'Junio C Hamano2014-06-061-5/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | pager: remove 'S' from $LESS by defaultmm/pager-less-sans-SMatthieu Moy2014-05-071-5/+10
* | | | | | Documentation: git-gui: describe gui.displayuntrackedmk/doc-git-gui-display-untrackedMax Kirillov2014-04-211-0/+4
|/ / / / /
* | | | | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-081-3/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Documentation: fix misuses of "nor"Justin Lebar2014-03-311-3/+3
| |/ / /
* | | | Merge branch 'nd/gc-aggressive'Junio C Hamano2014-04-031-0/+5
|\ \ \ \