summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mc/commit-doc-grammofix'Junio C Hamano2015-06-011-1/+1
|\
| * Documentation/git-commit: grammofixmc/commit-doc-grammofixMichael Coleman2015-05-191-1/+1
* | Merge branch 'jk/http-backend-deadlock'Junio C Hamano2015-06-011-0/+9
|\ \
| * \ Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlockjk/http-backend-deadlockJunio C Hamano2015-05-251-0/+9
| |\ \
| | * \ Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3jk/http-backend-deadlock-2.3Junio C Hamano2015-05-251-0/+9
| | |\ \
| | | * | http-backend: spool ref negotiation requests to bufferjk/http-backend-deadlock-2.2Jeff King2015-05-251-0/+9
* | | | | Sync with 2.4.2Junio C Hamano2015-05-262-1/+47
|\ \ \ \ \
| * | | | | Git 2.4.2v2.4.2Junio C Hamano2015-05-262-1/+47
| * | | | | Merge branch 'jc/hash-object' into maintJunio C Hamano2015-05-261-2/+8
| |\ \ \ \ \
* | | | | | | Fifth batch for 2.5 cycleJunio C Hamano2015-05-261-6/+28
* | | | | | | Merge branch 'nd/untracked-cache'Junio C Hamano2015-05-263-1/+80
|\ \ \ \ \ \ \
| * | | | | | | git-status.txt: advertisement for untracked cacheNguyễn Thái Ngọc Duy2015-03-121-1/+4
| * | | | | | | untracked cache: guard and disable on system changesNguyễn Thái Ngọc Duy2015-03-121-0/+4
| * | | | | | | update-index: test the system before enabling untracked cacheNguyễn Thái Ngọc Duy2015-03-121-0/+6
| * | | | | | | update-index: manually enable or disable untracked cacheNguyễn Thái Ngọc Duy2015-03-121-0/+8
| * | | | | | | untracked cache: save to an index extensionNguyễn Thái Ngọc Duy2015-03-121-0/+58
* | | | | | | | Merge branch 'pt/pull-ff-vs-merge-ff'Junio C Hamano2015-05-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | pull: make pull.ff=true override merge.ffPaul Tan2015-05-181-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Fourth batch for 2.5 cycleJunio C Hamano2015-05-221-0/+75
* | | | | | | | Merge branch 'ps/doc-packfile-vs-pack-file'Junio C Hamano2015-05-223-9/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: fix inconsistent spelling of "packfile"ps/doc-packfile-vs-pack-filePatrick Steinhardt2015-05-222-3/+3
| * | | | | | | | pack-protocol.txt: fix insconsistent spelling of "packfile"Patrick Steinhardt2015-05-171-3/+3
| * | | | | | | | git-unpack-objects.txt: fix inconsistent spelling of "packfile"Patrick Steinhardt2015-05-171-2/+2
| * | | | | | | | git-verify-pack.txt: fix inconsistent spelling of "packfile"Patrick Steinhardt2015-05-171-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'mh/lockfile-retry'Junio C Hamano2015-05-221-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | lock_packed_refs(): allow retries when acquiring the packed-refs lockmh/lockfile-retryMichael Haggerty2015-05-141-0/+6
* | | | | | | | | Merge branch 'jk/asciidoc-markup-fix'Junio C Hamano2015-05-2219-102/+107
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: convert AsciiDoc {?foo} to ifdef::foo[]jk/asciidoc-markup-fixJeff King2015-05-141-2/+6
| * | | | | | | | | doc: put example URLs and emails inside literal backticksJeff King2015-05-123-5/+5
| * | | | | | | | | doc: drop backslash quoting of some curly bracesJeff King2015-05-121-7/+7
| * | | | | | | | | doc: convert \--option to --optionJeff King2015-05-1211-80/+80
| * | | | | | | | | doc/add: reformat `--edit` optionJeff King2015-05-121-1/+2
| * | | | | | | | | doc: fix length of underlined section-titleJeff King2015-05-121-1/+1
| * | | | | | | | | doc: fix hanging "+"-continuationJeff King2015-05-121-3/+3
| * | | | | | | | | doc: fix unquoted use of "{type}"Jeff King2015-05-121-1/+1
| * | | | | | | | | doc: fix misrendering due to `single quote'Jeff King2015-05-122-2/+2
* | | | | | | | | | Merge branch 'jk/stripspace-asciidoctor-fix'Junio C Hamano2015-05-221-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc: fix unmatched code fences in git-stripspacejk/stripspace-asciidoctor-fixJeff King2015-05-121-3/+3
* | | | | | | | | | | Merge branch 'ja/tutorial-asciidoctor-fix'Junio C Hamano2015-05-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | doc: fix unmatched code fencesja/tutorial-asciidoctor-fixJean-Noel Avila2015-05-121-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'ls/http-ssl-cipher-list'Junio C Hamano2015-05-221-0/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | http: add support for specifying an SSL cipher listls/http-ssl-cipher-listLars Kellogg-Stedman2015-05-081-0/+13
* | | | | | | | | | | | Third batch for 2.5 cycleJunio C Hamano2015-05-191-0/+81
* | | | | | | | | | | | Merge branch 'kn/cat-file-literally'Junio C Hamano2015-05-191-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | cat-file: teach cat-file a '--allow-unknown-type' optionKarthik Nayak2015-05-061-1/+4
* | | | | | | | | | | | | Merge branch 'jc/merge'Junio C Hamano2015-05-191-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | merge: handle FETCH_HEAD internallyJunio C Hamano2015-04-291-0/+4
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fg/document-commit-message-stripping'Junio C Hamano2015-05-191-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Documentation: clarify how "git commit" cleans up the edited log messagefg/document-commit-message-strippingFredrik Gustafsson2015-04-271-4/+7
* | | | | | | | | | | | | Sync with 2.4.1Junio C Hamano2015-05-132-1/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
View Lorry Controller Status