summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pw/maint-p4-rcs-expansion-newline'Junio C Hamano2012-11-202-1/+20
|\
| * git p4: RCS expansion should not span newlinesPete Wyckoff2012-11-082-1/+20
* | Merge branch 'mh/alt-odb-string-list-cleanup'Junio C Hamano2012-11-201-28/+22
|\ \
| * | link_alt_odb_entries(): take (char *, len) rather than two pointersMichael Haggerty2012-11-081-5/+5
| * | link_alt_odb_entries(): use string_list_split_in_place()Michael Haggerty2012-11-081-24/+18
* | | Merge branch 'ta/doc-cleanup'Junio C Hamano2012-11-2020-68/+134
|\ \ \
| * | | Documentation: build html for all files in technical and howtoThomas Ackermann2012-10-251-2/+24
| * | | Documentation/howto: convert plain text files to asciidocThomas Ackermann2012-10-1811-34/+68
| * | | Documentation/technical: convert plain text files to asciidocThomas Ackermann2012-10-165-27/+34
| * | | Change headline of technical/send-pack-pipeline.txt to not confuse its conten...Thomas Ackermann2012-10-161-2/+2
| * | | Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1Thomas Ackermann2012-10-161-2/+2
| * | | Split over-long synopsis in git-fetch-pack.txt into several linesThomas Ackermann2012-10-161-1/+4
* | | | Merge branch 'kb/preload-index-more'Junio C Hamano2012-11-203-6/+15
|\ \ \ \
| * | | | update-index/diff-index: use core.preloadindex to improve performanceKarsten Blees2012-11-023-6/+15
| | |_|/ | |/| |
* | | | Merge branch 'jk/maint-http-half-auth-fetch'Junio C Hamano2012-11-203-8/+39
|\ \ \ \
| * | | | remote-curl: retry failed requests for auth even with gzipJeff King2012-10-313-1/+32
| * | | | remote-curl: hoist gzip buffer size to top of post_rpcJeff King2012-10-311-7/+7
* | | | | Sync with maintJunio C Hamano2012-11-201-1/+7
|\ \ \ \ \
| * | | | | Further preparation for 1.8.0.1Junio C Hamano2012-11-201-1/+7
| * | | | | Merge branch 'mg/maint-pull-suggest-upstream-to' into maintJunio C Hamano2012-11-201-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'mm/maint-doc-commit-edit' into maintJunio C Hamano2012-11-201-0/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'as/maint-doc-fix-no-post-rewrite' into maintJunio C Hamano2012-11-201-4/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/lock-correct-ref-during-delete' into maintJunio C Hamano2012-11-201-13/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rf/maint-mailmap-off-by-one' into maintJunio C Hamano2012-11-201-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-diff-grep-textconv' into maintJunio C Hamano2012-11-202-2/+14
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'js/format-2047' into maintJunio C Hamano2012-11-205-126/+262
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Sync with maintJunio C Hamano2012-11-181-0/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Start preparing for 1.8.0.1Junio C Hamano2012-11-182-1/+47
| * | | | | | | | | | | | Merge branch 'sz/maint-curl-multi-timeout' into maintJunio C Hamano2012-11-181-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'po/maint-refs-replace-docs' into maintJunio C Hamano2012-11-181-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/pull-rebase-detached' into maintJunio C Hamano2012-11-181-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/maint-doc-remote-tracking' into maintJunio C Hamano2012-11-184-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/branch-del-symref' into maintJunio C Hamano2012-11-182-26/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/grep-true-path' into maintJunio C Hamano2012-11-184-17/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/grep-pcre-loose-ends' (early part) into maintJunio C Hamano2012-11-185-128/+204
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/mergetools-p4' into maintJunio C Hamano2012-11-181-0/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/test-say-color-avoid-echo-escape' into maintJunio C Hamano2012-11-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/config-lift-variable-name-length-limit' into maintJunio C Hamano2012-11-181-30/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | Start 1.8.1 cycleJunio C Hamano2012-11-152-1/+152
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/prettier-pretty-note'Junio C Hamano2012-11-1513-47/+100
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | format-patch: add a blank line between notes and diffstatJunio C Hamano2012-11-131-10/+21
| * | | | | | | | | | | | | | | | | | | | | | | Doc User-Manual: Patch cover letter, three dashes, and --notesPhilip Oakley2012-10-261-0/+7
| * | | | | | | | | | | | | | | | | | | | | | | Doc format-patch: clarify --notes use casePhilip Oakley2012-10-261-7/+6
| * | | | | | | | | | | | | | | | | | | | | | | Doc notes: Include the format-patch --notes optionPhilip Oakley2012-10-251-0/+4
| * | | | | | | | | | | | | | | | | | | | | | | Doc SubmittingPatches: Mention --notes option after "cover letter"Philip Oakley2012-10-251-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | Documentation: decribe format-patch --notesJunio C Hamano2012-10-191-1/+14
| * | | | | | | | | | | | | | | | | | | | | | | format-patch --notes: show notes after three-dashesJunio C Hamano2012-10-173-6/+17
| * | | | | | | | | | | | | | | | | | | | | | | format-patch: append --signature after notesJunio C Hamano2012-10-172-4/+14
| * | | | | | | | | | | | | | | | | | | | | | | pretty_print_commit(): do not append notes messageJunio C Hamano2012-10-172-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | pretty: prepare notes message at a centralized placeJunio C Hamano2012-10-173-7/+18