summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'jc/mention-tracking-for-pull-default' into maintJunio C Hamano2013-02-251-1/+2
| |\ \ \ \
| * | | | | Documentation: "advice" is uncountableGreg Price2013-02-251-1/+1
| | |/ / / | |/| | |
| * | | | Merge branch 'ss/help-htmlpath-config-doc' into maintJunio C Hamano2013-01-281-0/+6
| |\ \ \ \
* | \ \ \ \ Merge branch 'jc/mention-tracking-for-pull-default'Junio C Hamano2013-02-181-1/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | doc: mention tracking for pull.defaultJunio C Hamano2013-01-311-1/+2
* | | | | | Merge branch 'jc/hidden-refs'Junio C Hamano2013-02-171-0/+23
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | upload/receive-pack: allow hiding ref hierarchiesJunio C Hamano2013-02-071-0/+23
* | | | | | Merge branch 'ta/doc-no-small-caps'Junio C Hamano2013-02-051-56/+56
|\ \ \ \ \ \
| * | | | | | Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-011-56/+56
* | | | | | | Merge branch 'jc/push-reject-reasons'Junio C Hamano2013-02-041-1/+11
|\ \ \ \ \ \ \
| * | | | | | | push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCEJunio C Hamano2013-01-241-1/+11
* | | | | | | | Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-041-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow custom "comment char"Junio C Hamano2013-01-161-0/+6
* | | | | | | | | Enable minimal stat checkingRobin Rosenberg2013-01-221-0/+6
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'rt/commit-cleanup-config'Junio C Hamano2013-01-201-0/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: make default of "cleanup" option configurableRalf Thielow2013-01-101-0/+9
| |/ / / / / / /
* | | | | | | | Merge branch 'ap/log-mailmap'Junio C Hamano2013-01-201-0/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | log: add log.mailmap configuration optionAntoine Pelisse2013-01-101-0/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'ss/help-htmlpath-config-doc'Junio C Hamano2013-01-181-0/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | config.txt: Document help.htmlpath config parameterSebastian Staudt2013-01-151-0/+6
| | |_|/ / | |/| | |
* | | | | Merge branch 'nd/maint-branch-desc-doc'Junio C Hamano2013-01-091-0/+6
|\ \ \ \ \
| * | | | | config.txt: a few lines about branch.<name>.descriptionNguyễn Thái Ngọc Duy2013-01-011-0/+6
| |/ / / /
* | | | | Merge branch 'wk/submodule-update-remote'Junio C Hamano2013-01-051-0/+6
|\ \ \ \ \
| * | | | | submodule update: add --remote for submodule's upstream changesW. Trevor King2012-12-191-0/+6
* | | | | | Merge branch 'jk/mailmap-from-blob'Junio C Hamano2013-01-051-0/+8
|\ \ \ \ \ \
| * | | | | | mailmap: default mailmap.blob in bare repositoriesJeff King2012-12-131-3/+5
| * | | | | | mailmap: support reading mailmap from blobsJeff King2012-12-121-0/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'cr/push-force-tag-update'Junio C Hamano2013-01-051-3/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | push: allow already-exists advice to be disabledChris Rorvick2012-12-031-2/+6
| * | | | push: rename config variable for more general useChris Rorvick2012-12-031-1/+1
* | | | | Merge branch 'mm/status-push-pull-advise'Junio C Hamano2012-12-041-2/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | document that statusHints affects git checkoutMatthieu Moy2012-12-041-2/+3
| | |_|/ | |/| |
* | | | Documentation: move diff.wordRegex from config.txt to diff-config.txtRamkumar Ramachandra2012-11-181-6/+0
| |/ / |/| |