summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'po/dot-url'Junio C Hamano2013-10-231-2/+4
|\
| * config doc: update dot-repository notesPhilip Oakley2013-09-131-2/+4
* | Merge branch 'nv/doc-config-signingkey'Jonathan Nieder2013-10-141-5/+5
|\ \
| * | config doc: user.signingkey is also used for signed commitsnv/doc-config-signingkeyNicolas Vigier2013-10-141-5/+5
* | | Merge branch 'bc/submodule-status-ignored'Jonathan Nieder2013-09-241-2/+10
|\ \ \
| * | | Improve documentation concerning the status.submodulesummary settingbc/submodule-status-ignoredJens Lehmann2013-09-111-2/+10
* | | | Merge branch 'jk/upload-pack-keepalive'Junio C Hamano2013-09-201-0/+11
|\ \ \ \
| * | | | upload-pack: bump keepalive default to 5 secondsjk/upload-pack-keepaliveJeff King2013-09-091-1/+1
| * | | | upload-pack: send keepalive packets during pack computationJeff King2013-09-091-0/+11
* | | | | Merge branch 'mm/status-without-comment-char'Junio C Hamano2013-09-201-0/+7
|\ \ \ \ \
| * | | | | status: disable display of '#' comment prefix by defaultMatthieu Moy2013-09-061-0/+7
| | |/ / / | |/| | |
* | | | | Merge branch 'rh/ishes-doc'Junio C Hamano2013-09-171-2/+2
|\ \ \ \ \
| * | | | | use 'commit-ish' instead of 'committish'Richard Hansen2013-09-041-2/+2
| |/ / / /
* | | | | Merge branch 'jx/clean-interactive'Junio C Hamano2013-09-171-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | documentation: clarify notes for clean.requireForceJiang Xin2013-08-281-2/+2
* | | | | Merge branch 'jc/pager-configuration-doc'Junio C Hamano2013-09-121-16/+14
|\ \ \ \ \
| * | | | | config: rewrite core.pager documentationjc/pager-configuration-docJunio C Hamano2013-08-291-16/+14
* | | | | | Merge branch 'sh/pull-rebase-preserve'Junio C Hamano2013-09-111-0/+8
|\ \ \ \ \ \
| * | | | | | pull: allow pull to preserve merges when rebasingsh/pull-rebase-preserveStephen Haberman2013-09-041-0/+8
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jc/url-match'Junio C Hamano2013-09-091-0/+45
|\ \ \ \ \ \
| * | | | | | config: parse http.<url>.<variable> using urlmatchKyle J. McKay2013-08-051-0/+45
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'db/http-savecookies'Junio C Hamano2013-09-091-1/+5
|\ \ \ \ \ \
| * | | | | | http: add http.savecookies option to write out HTTP cookiesDave Borowitz2013-07-301-1/+5
* | | | | | | Merge branch 'ms/fetch-prune-configuration'Junio C Hamano2013-09-091-0/+10
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | fetch: make --prune configurablems/fetch-prune-configurationMichael Schubert2013-07-181-0/+10
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rj/cygwin-clarify-use-of-cheating-lstat'Junio C Hamano2013-08-021-11/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | cygwin: Remove the Win32 l/stat() implementationrj/cygwin-clarify-use-of-cheating-lstatRamsay Jones2013-07-181-11/+0
* | | | | | Merge branch 'rr/send-email-ssl-verify'Junio C Hamano2013-07-221-0/+4
|\ \ \ \ \ \
| * | | | | | send-email: be explicit with SSL certificate verificationrr/send-email-ssl-verifyRamkumar Ramachandra2013-07-181-0/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jx/clean-interactive'Junio C Hamano2013-07-221-8/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | git-clean: add colors to interactive git-cleanJiang Xin2013-06-261-8/+9
| * | | | git-clean: show items of del_list in columnsJiang Xin2013-06-261-0/+4
| |/ / /
* | | | Merge branch 'jg/status-config'Junio C Hamano2013-07-111-0/+8
|\ \ \ \
| * | | | status: introduce status.branch to enable --branch by defaultJorge Juan Garcia Garcia2013-06-241-0/+4
| * | | | status: introduce status.short to enable --short by defaultJorge Juan Garcia Garcia2013-06-241-0/+4
| |/ / /
* | | | Merge branch 'jc/triangle-push-fixup'Junio C Hamano2013-07-111-30/+50
|\ \ \ \
| * | | | push: change `simple` to accommodate triangular workflowsRamkumar Ramachandra2013-06-241-3/+7
| * | | | config doc: rewrite push.default sectionRamkumar Ramachandra2013-06-231-28/+44
* | | | | Merge branch 'rr/column-doc'Junio C Hamano2013-07-011-3/+17
|\ \ \ \ \
| * | | | | column doc: rewrite documentation for column.uiRamkumar Ramachandra2013-06-261-3/+17
| | |/ / / | |/| | |
* | | | | Merge branch 'mm/rm-coalesce-errors'Junio C Hamano2013-06-241-0/+3
|\ \ \ \ \
| * | | | | rm: introduce advice.rmHints to shorten messagesMathieu Lienard--Mayor2013-06-121-0/+3
| |/ / / /
* | | | | Revert "Merge branch 'jg/status-config'"Junio C Hamano2013-06-241-8/+0
* | | | | Merge branch 'jg/status-config'Junio C Hamano2013-06-231-0/+8
|\ \ \ \ \
| * | | | | status: introduce status.branch to enable --branch by defaultJorge Juan Garcia Garcia2013-06-151-0/+4
| * | | | | status: introduce status.short to enable --short by defaultJorge Juan Garcia Garcia2013-06-111-0/+4
| |/ / / /
* | | | | Merge branch 'mm/color-auto-default'Junio C Hamano2013-06-201-5/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | make color.ui default to 'auto'Matthieu Moy2013-06-101-5/+6
| | |/ / | |/| |
* | | | rebase: implement --[no-]autostash and rebase.autostashRamkumar Ramachandra2013-05-291-0/+8
| |/ / |/| |
* | | Merge branch 'maint'Junio C Hamano2013-04-281-6/+6
|\ \ \ | |/ /