summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'jk/clone-copy-alternates-fix' into maintJunio C Hamano2016-10-281-2/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clone: detect errors in normalize_path_copyjk/clone-copy-alternates-fixJeff King2016-10-051-2/+5
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'dt/http-empty-auth' into maintJunio C Hamano2016-10-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | http: http.emptyauth should allow empty (not just NULL) usernamesdt/http-empty-authDavid Turner2016-10-041-1/+1
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'dp/autoconf-curl-ssl' into maintJunio C Hamano2016-10-281-10/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ./configure.ac: detect SSL in libcurl using curl-configdp/autoconf-curl-sslДилян Палаузов2016-06-281-10/+11
* | | | | | | | | | | | Merge branch 'ak/curl-imap-send-explicit-scheme' into maintJunio C Hamano2016-10-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | imap-send: Tell cURL to use imap:// or imaps://ak/curl-imap-send-explicit-schemeAnders Kaseorg2016-08-171-0/+1
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jt/fetch-pack-in-vain-count-with-stateless' into maintJunio C Hamano2016-10-281-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fetch-pack: do not reset in_vain on non-novel acksjt/fetch-pack-in-vain-count-with-statelessJonathan Tan2016-09-231-2/+9
* | | | | | | | | | | | | Merge branch 'js/regexec-buf' into maintJunio C Hamano2016-10-281-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | configure.ac: improve description of NO_REGEX testJakub Narębski2016-10-101-6/+7
* | | | | | | | | | | | | | Merge branch 'rs/c-auto-resets-attributes' into maintJunio C Hamano2016-10-281-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | pretty: avoid adding reset for %C(auto) if output is emptyrs/c-auto-resets-attributesRené Scharfe2016-09-292-2/+2
| * | | | | | | | | | | | | | pretty: let %C(auto) reset all attributesRené Scharfe2016-09-192-1/+3
* | | | | | | | | | | | | | | Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc' into maintJunio C Hamano2016-10-281-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | doc: remove reference to the traditional layout in git-tag.txtyk/git-tag-remove-mention-of-old-layout-in-docYounes Khoudli2016-10-201-3/+2
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge tag 'l10n-2.10.0-rnd2.4' of git://github.com/git-l10n/git-po into maintJunio C Hamano2016-10-172-2417/+2813
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2016-10-161-26/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-07-121-26/+26
| * | | | | | | | | | | | | | | l10n: de.po: translate 260 new messagesRalf Thielow2016-10-121-2387/+2783
| * | | | | | | | | | | | | | | l10n: de.po: fix translation of autostashRalf Thielow2016-09-121-4/+4
* | | | | | | | | | | | | | | | Start preparing for 2.10.2Junio C Hamano2016-10-112-1/+46
* | | | | | | | | | | | | | | | Merge branch 'jk/verify-packfile-gently' into maintJunio C Hamano2016-10-111-5/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | verify_packfile: check pack validity before accessing datajk/verify-packfile-gentlyJeff King2016-09-221-5/+2
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jc/worktree-config' into maintJunio C Hamano2016-10-111-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | worktree: honor configuration variablesjc/worktree-configJunio C Hamano2016-09-271-0/+2
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jc/verify-loose-object-header' into maintJunio C Hamano2016-10-112-8/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | unpack_sha1_header(): detect malformed object headerjc/verify-loose-object-headerJunio C Hamano2016-09-261-2/+24
| * | | | | | | | | | | | | | | | streaming: make sure to notice corrupt objectJunio C Hamano2016-09-261-6/+6
* | | | | | | | | | | | | | | | | Merge branch 'rs/git-gui-use-modern-git-merge-syntax' into maintJunio C Hamano2016-10-111-6/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-...rs/git-gui-use-modern-git-merge-syntaxJunio C Hamano2016-09-261-6/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | git-gui: stop using deprecated merge syntaxRené Scharfe2016-09-261-6/+1
* | | | | | | | | | | | | | | | | | Merge branch 'kd/mailinfo-quoted-string' into maintJunio C Hamano2016-10-116-33/+159
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | mailinfo: unescape quoted-pair in header fieldskd/mailinfo-quoted-stringKevin Daudt2016-09-286-0/+124
| * | | | | | | | | | | | | | | | | | t5100-mailinfo: replace common path prefix with variableKevin Daudt2016-09-281-33/+35
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'pb/rev-list-reverse-with-count' into maintJunio C Hamano2016-10-111-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | rev-list-options: clarify the usage of --reversepb/rev-list-reverse-with-countPranit Bauva2016-09-271-2/+3
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/blame-abbrev' into maintJunio C Hamano2016-10-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | blame: use DEFAULT_ABBREV macrojc/blame-abbrevJunio C Hamano2016-09-281-1/+1
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/graph-padding-fix' into maintJunio C Hamano2016-10-111-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | graph: fix extra spaces in graph_padding_linejk/graph-padding-fixJeff King2016-09-291-4/+12
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'sg/ref-filter-parse-optim' into maintJunio C Hamano2016-10-111-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | ref-filter: strip format option after a field name only once while parsingsg/ref-filter-parse-optimSZEDER Gábor2016-10-031-11/+11
| | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'rs/copy-array' into maintJunio C Hamano2016-10-117-9/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | use COPY_ARRAYrs/copy-arrayRené Scharfe2016-09-256-9/+32
| * | | | | | | | | | | | | | | | | | add COPY_ARRAYRené Scharfe2016-09-251-0/+8
* | | | | | | | | | | | | | | | | | | Merge branch 'dt/mailinfo' into maintJunio C Hamano2016-10-111-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | add David Turner's Two Sigma addressdt/mailinfoDavid Turner2016-09-261-0/+1
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Git 2.10.1v2.10.1Junio C Hamano2016-10-033-2/+14