summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Update draft release notes to 2.0Junio C Hamano2014-04-211-3/+12
* Merge git://bogomips.org/git-svnJunio C Hamano2014-04-211-16/+4
|\
| * Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not givenJohan Herland2014-04-191-16/+4
* | Merge branch 'jx/i18n'Junio C Hamano2014-04-211-0/+10
|\ \
| * | i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelinesjx/i18nJunio C Hamano2014-04-181-0/+10
* | | Merge branch 'ep/shell-command-substitution'Junio C Hamano2014-04-212-9/+9
|\ \ \ | |_|/ |/| |
| * | install-webdoc.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-3/+3
| * | howto-index.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-6/+6
* | | Git 2.0-rc0v2.0.0-rc0Junio C Hamano2014-04-181-0/+5
| |/ |/|
* | Update draft release notes for 2.0Junio C Hamano2014-04-161-0/+11
* | Sync with 1.9.2Junio C Hamano2014-04-093-2/+23
|\ \
| * | Git 1.9.2v1.9.2Junio C Hamano2014-04-092-1/+22
| * | Merge branch 'jl/nor-or-nand-and' into maintJunio C Hamano2014-04-0925-44/+43
| |\ \
| * \ \ Merge commit 'doc/http-backend: missing accent grave in literal mark-up'Junio C Hamano2014-04-091-1/+1
| |\ \ \
| | * | | doc/http-backend: missing accent grave in literal mark-upThomas Ackermann2014-04-091-1/+1
* | | | | Update draft release notes to 2.0Junio C Hamano2014-04-081-17/+11
* | | | | Merge branch 'maint'Junio C Hamano2014-04-081-0/+9
|\ \ \ \ \ | |/ / / /
| * | | | Update draft release notes to 1.9.2Junio C Hamano2014-04-081-0/+9
* | | | | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-0825-44/+43
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Documentation: fix misuses of "nor"Justin Lebar2014-03-3125-44/+43
* | | | | Merge branch 'mr/opt-set-ptr'Junio C Hamano2014-04-081-4/+0
|\ \ \ \ \
| * | | | | parse-options: remove unused OPT_SET_PTRmr/opt-set-ptrMarat Radchenko2014-03-311-4/+0
* | | | | | Merge branch 'ib/rev-parse-parseopt-argh'Junio C Hamano2014-04-081-1/+1
|\ \ \ \ \ \
| * | | | | | rev-parse: fix typo in example on manpageib/rev-parse-parseopt-arghRené Scharfe2014-04-011-1/+1
* | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano2014-04-087-19/+23
|\ \ \ \ \ \ \
| * | | | | | | update-index: teach --cacheinfo a new syntax "mode,sha1,path"Junio C Hamano2014-03-241-2/+6
| * | | | | | | parse-options: multi-word argh should use dash to separate wordsJunio C Hamano2014-03-246-17/+17
| |/ / / / / /
* | | | | | | Update draft release notes to 2.0Junio C Hamano2014-04-031-0/+25
* | | | | | | Merge branch 'maint'Junio C Hamano2014-04-031-0/+38
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Start preparing for 1.9.1Junio C Hamano2014-04-031-0/+38
| * | | | | | Merge branch 'rr/doc-merge-strategies' into maintJunio C Hamano2014-04-031-2/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'nd/gc-aggressive'Junio C Hamano2014-04-032-0/+8
|\ \ \ \ \ \ \
| * | | | | | | gc --aggressive: make --depth configurableNguyễn Thái Ngọc Duy2014-03-312-0/+8
* | | | | | | | Merge branch 'nd/log-show-linear-break'Junio C Hamano2014-04-031-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | log: add --show-linear-break to help see non-linear historynd/log-show-linear-breakNguyễn Thái Ngọc Duy2014-03-251-0/+7
* | | | | | | | | Revert part of 384364b (Start preparing for Git 2.0, 2014-03-07)Junio C Hamano2014-04-021-5/+0
* | | | | | | | | Revert "submodule: explicit local branch creation in module_clone"Junio C Hamano2014-04-022-30/+8
* | | | | | | | | Revert "Merge branch 'wt/doc-submodule-name-path-confusion-2'"Junio C Hamano2014-04-011-1/+1
* | | | | | | | | Update draft release notes to 2.0Junio C Hamano2014-03-311-0/+13
* | | | | | | | | Merge branch 'wt/doc-submodule-name-path-confusion-2'Junio C Hamano2014-03-311-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: submodule.*.branch config is keyed by namewt/doc-submodule-name-path-confusion-2W. Trevor King2014-03-271-1/+1
* | | | | | | | | | Merge branch 'wt/doc-submodule-name-path-confusion-1'Junio C Hamano2014-03-311-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc: submodule.* config are keyed by submodule nameswt/doc-submodule-name-path-confusion-1W. Trevor King2014-03-271-1/+1
* | | | | | | | | | | Merge branch 'ib/rev-parse-parseopt-argh'Junio C Hamano2014-03-311-2/+32
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | rev-parse --parseopt: option argument name hintsIlya Bobyr2014-03-231-2/+32
* | | | | | | | | | | Merge branch 'dw/doc-status-no-longer-shows-pound-prefix'Junio C Hamano2014-03-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | doc: status, remove leftover statement about '#' prefixdw/doc-status-no-longer-shows-pound-prefixDirk Wallenstein2014-03-211-1/+1
* | | | | | | | | | | | Merge branch 'ca/doc-config-third-party'Junio C Hamano2014-03-311-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | config.txt: third-party tools may and do use their own variablesca/doc-config-third-partyChris Angelico2014-03-211-2/+7
* | | | | | | | | | | | | Update draft release notes to 2.0Junio C Hamano2014-03-281-0/+27