summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * documentation: trivial whitespace cleanupsFelipe Contreras2013-04-281-6/+6
* | Merge branch 'ta/glossary'Junio C Hamano2013-04-211-1/+1
|\ \ | |/
| * The name of the hash function is "SHA-1", not "SHA1"Thomas Ackermann2013-04-151-1/+1
* | Merge branch 'fc/branch-upstream-color'Junio C Hamano2013-04-191-1/+2
|\ \
| * | branch: colour upstream branchesFelipe Contreras2013-04-151-1/+2
* | | Merge branch 'mv/ssl-ftp-curl'Junio C Hamano2013-04-191-0/+8
|\ \ \
| * | | Support FTP-over-SSL/TLS for regular FTPModestas Vainius2013-04-121-0/+8
| | |/ | |/|
| * | Merge branch 'tb/document-status-u-tradeoff' into maintJunio C Hamano2013-04-011-0/+4
| |\ \
* | \ \ Merge branch 'fc/send-email-annotate'Junio C Hamano2013-04-181-0/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | format-patch: add format.coverLetter configuration variableFelipe Contreras2013-04-071-0/+5
| * | | send-email: make annotate configurableFelipe Contreras2013-04-071-0/+1
* | | | remote.c: introduce branch.<name>.pushremoteRamkumar Ramachandra2013-04-021-4/+15
* | | | remote.c: introduce remote.pushdefaultRamkumar Ramachandra2013-04-021-3/+10
|/ / /
* | | Merge branch 'maint'Junio C Hamano2013-03-281-1/+1
|\ \ \ | |/ /
| * | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-281-1/+1
| |\ \
| | * | git help config: s/insn/instruction/Matthias Krüger2013-03-281-1/+1
| * | | Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maintJunio C Hamano2013-03-261-1/+1
| |\ \ \
* | \ \ \ Merge branch 'jc/fetch-raw-sha1'Junio C Hamano2013-03-211-1/+7
|\ \ \ \ \
| * | | | | upload-pack: optionally allow fetching from the tips of hidden refsJunio C Hamano2013-02-071-1/+7
* | | | | | Merge branch 'tb/document-status-u-tradeoff'Junio C Hamano2013-03-211-0/+4
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | status: advise to consider use of -u when read_directory takes too longNguyễn Thái Ngọc Duy2013-03-161-0/+4
| * | | | | Documentation: move diff.wordRegex from config.txt to diff-config.txtRamkumar Ramachandra2012-12-271-6/+0
* | | | | | Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs'Junio C Hamano2013-03-191-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Fix ".git/refs" stragglersGreg Price2013-02-241-1/+1
* | | | | Sync with 'maint'Junio C Hamano2013-02-251-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |