aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAge
* Merge branch 'mm/rm-coalesce-errors'Junio C Hamano2013-06-24
|\
| * rm: introduce advice.rmHints to shorten messagesMathieu Lienard--Mayor2013-06-12
* | Revert "Merge branch 'jg/status-config'"Junio C Hamano2013-06-24
* | Merge branch 'jg/status-config'Junio C Hamano2013-06-23
|\ \
| * | status: introduce status.branch to enable --branch by defaultJorge Juan Garcia Garcia2013-06-15
| * | status: introduce status.short to enable --short by defaultJorge Juan Garcia Garcia2013-06-11
| |/
* | Merge branch 'mm/color-auto-default'Junio C Hamano2013-06-20
|\ \
| * | make color.ui default to 'auto'Matthieu Moy2013-06-10
* | | rebase: implement --[no-]autostash and rebase.autostashRamkumar Ramachandra2013-05-29
| |/ |/|
* | Merge branch 'maint'Junio C Hamano2013-04-28
|\ \ | |/
| * documentation: trivial whitespace cleanupsFelipe Contreras2013-04-28
* | Merge branch 'ta/glossary'Junio C Hamano2013-04-21
|\ \ | |/
| * The name of the hash function is "SHA-1", not "SHA1"Thomas Ackermann2013-04-15
* | Merge branch 'fc/branch-upstream-color'Junio C Hamano2013-04-19
|\ \
| * | branch: colour upstream branchesFelipe Contreras2013-04-15
* | | Merge branch 'mv/ssl-ftp-curl'Junio C Hamano2013-04-19
|\ \ \
| * | | Support FTP-over-SSL/TLS for regular FTPModestas Vainius2013-04-12
| | |/ | |/|
| * | Merge branch 'tb/document-status-u-tradeoff' into maintJunio C Hamano2013-04-01
| |\ \
* | \ \ Merge branch 'fc/send-email-annotate'Junio C Hamano2013-04-18
|\ \ \ \ | |_|_|/ |/| | |
| * | | format-patch: add format.coverLetter configuration variableFelipe Contreras2013-04-07
| * | | send-email: make annotate configurableFelipe Contreras2013-04-07
* | | | remote.c: introduce branch.<name>.pushremoteRamkumar Ramachandra2013-04-02
* | | | remote.c: introduce remote.pushdefaultRamkumar Ramachandra2013-04-02
|/ / /
* | | Merge branch 'maint'Junio C Hamano2013-03-28
|\ \ \ | |/ /
| * | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-28
| |\ \
| | * | git help config: s/insn/instruction/Matthias Krüger2013-03-28
| * | | Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maintJunio C Hamano2013-03-26
| |\ \ \
* | \ \ \ Merge branch 'jc/fetch-raw-sha1'Junio C Hamano2013-03-21
|\ \ \ \ \
| * | | | | upload-pack: optionally allow fetching from the tips of hidden refsJunio C Hamano2013-02-07
* | | | | | Merge branch 'tb/document-status-u-tradeoff'Junio C Hamano2013-03-21
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | status: advise to consider use of -u when read_directory takes too longNguyễn Thái Ngọc Duy2013-03-16
| * | | | | Documentation: move diff.wordRegex from config.txt to diff-config.txtRamkumar Ramachandra2012-12-27
* | | | | | Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs'Junio C Hamano2013-03-19
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Fix ".git/refs" stragglersGreg Price2013-02-24
* | | | | Sync with 'maint'Junio C Hamano2013-02-25
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'jc/mention-tracking-for-pull-default' into maintJunio C Hamano2013-02-25
| |\ \ \ \
| * | | | | Documentation: "advice" is uncountableGreg Price2013-02-25
| | |/ / / | |/| | |
| * | | | Merge branch 'ss/help-htmlpath-config-doc' into maintJunio C Hamano2013-01-28
| |\ \ \ \
* | \ \ \ \ Merge branch 'jc/mention-tracking-for-pull-default'Junio C Hamano2013-02-18
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | doc: mention tracking for pull.defaultJunio C Hamano2013-01-31
* | | | | | Merge branch 'jc/hidden-refs'Junio C Hamano2013-02-17
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | upload/receive-pack: allow hiding ref hierarchiesJunio C Hamano2013-02-07
* | | | | | Merge branch 'ta/doc-no-small-caps'Junio C Hamano2013-02-05
|\ \ \ \ \ \
| * | | | | | Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-01
* | | | | | | Merge branch 'jc/push-reject-reasons'Junio C Hamano2013-02-04
|\ \ \ \ \ \ \
| * | | | | | | push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCEJunio C Hamano2013-01-24
* | | | | | | | Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-04
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow custom "comment char"Junio C Hamano2013-01-16
* | | | | | | | | Enable minimal stat checkingRobin Rosenberg2013-01-22
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'rt/commit-cleanup-config'Junio C Hamano2013-01-20
|\ \ \ \ \ \ \ \