summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* stash: allow stashes to be referenced by index onlyaw/numbered-stashAaron M Watson2016-10-263-3/+50
* Sync with maintJunio C Hamano2016-10-172-2417/+2813
|\
| * 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
* | | | Tenth batch for 2.11Junio C Hamano2016-10-171-16/+49
* | | | Merge branch 'sb/submodule-config-doc-drop-path'Junio C Hamano2016-10-171-5/+6
|\ \ \ \
| * | | | documentation: improve submodule.<name>.{url, path} descriptionsb/submodule-config-doc-drop-pathStefan Beller2016-10-111-5/+6
* | | | | Merge branch 'rs/pretty-format-color-doc-fix'Junio C Hamano2016-10-171-1/+2
|\ \ \ \ \
| * | | | | pretty: fix document link for color specificationrs/pretty-format-color-doc-fixRené Scharfe2016-10-111-1/+2
| |/ / / /
* | | | | Merge branch 'js/reset-usage'Junio C Hamano2016-10-171-1/+1
|\ \ \ \ \
| * | | | | reset: fix usagejs/reset-usageJohannes Schindelin2016-10-111-1/+1
| |/ / / /
* | | | | Merge branch 'da/mergetool-diff-order'Junio C Hamano2016-10-173-86/+165
|\ \ \ \ \
| * | | | | mergetool: honor -O<orderfile>da/mergetool-diff-orderDavid Aguilar2016-10-113-6/+40
| * | | | | mergetool: honor diff.orderFileDavid Aguilar2016-10-113-15/+53
| * | | | | mergetool: move main program flow into a main() functionDavid Aguilar2016-10-111-87/+93
| * | | | | mergetool: add copyrightDavid Aguilar2016-10-111-0/+1
* | | | | | Merge branch 'rs/cocci'Junio C Hamano2016-10-176-22/+21
|\ \ \ \ \ \
| * | | | | | use strbuf_add_unique_abbrev() for adding short hashes, part 3René Scharfe2016-10-104-20/+15
| * | | | | | remove unnecessary NULL check before free(3)René Scharfe2016-10-102-2/+6
* | | | | | | Merge branch 'js/regexec-buf'Junio C Hamano2016-10-171-6/+7
|\ \ \ \ \ \ \
| * | | | | | | configure.ac: improve description of NO_REGEX testJakub Narębski2016-10-101-6/+7
* | | | | | | | Merge branch 'jk/ref-symlink-loop'Junio C Hamano2016-10-172-1/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | files_read_raw_ref: prevent infinite retry loops in generaljk/ref-symlink-loopJeff King2016-10-101-0/+7
| * | | | | | | | files_read_raw_ref: avoid infinite loop on broken symlinksJeff King2016-10-102-1/+11
* | | | | | | | | Merge branch 'jk/quarantine-received-objects'Junio C Hamano2016-10-178-1/+413
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tmp-objdir: do not migrate files starting with '.'Jeff King2016-10-101-1/+1
| * | | | | | | | | tmp-objdir: put quarantine information in the environmentJeff King2016-10-102-0/+3
| * | | | | | | | | receive-pack: quarantine objects until pre-receive acceptsJeff King2016-10-102-1/+76
| * | | | | | | | | tmp-objdir: introduce API for temporary object directoriesJeff King2016-10-103-0/+328
| * | | | | | | | | check_connected: accept an env argumentJeff King2016-10-102-0/+6
* | | | | | | | | | Merge branch 'jk/alt-odb-cleanup'Junio C Hamano2016-10-1712-222/+308
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | alternates: use fspathcmp to detect duplicatesJeff King2016-10-103-1/+20
| * | | | | | | | | sha1_file: always allow relative paths to alternatesJeff King2016-10-102-8/+23
| * | | | | | | | | count-objects: report alternates via verbose modeJeff King2016-10-103-0/+25
| * | | | | | | | | fill_sha1_file: write into a strbufJeff King2016-10-101-24/+10
| * | | | | | | | | alternates: store scratch buffer as strbufJeff King2016-10-103-18/+32
| * | | | | | | | | fill_sha1_file: write "boring" charactersJeff King2016-10-101-7/+5
| * | | | | | | | | alternates: use a separate scratch spaceJeff King2016-10-106-37/+24
| * | | | | | | | | alternates: encapsulate alt->base mungingJeff King2016-10-101-6/+13
| * | | | | | | | | alternates: provide helper for allocating alternateJeff King2016-10-103-15/+26
| * | | | | | | | | alternates: provide helper for adding to alternates listJeff King2016-10-103-23/+25
| * | | | | | | | | link_alt_odb_entry: refactor string handlingJeff King2016-10-101-38/+45
| * | | | | | | | | link_alt_odb_entry: handle normalize_path errorsJeff King2016-10-103-2/+37
| * | | | | | | | | t5613: clarify "too deep" recursion testsJeff King2016-10-101-8/+19
| * | | | | | | | | t5613: do not chdir in main processJeff King2016-10-031-59/+33
| * | | | | | | | | t5613: whitespace/style cleanupsJeff King2016-10-031-52/+62
| * | | | | | | | | t5613: use test_must_failJeff King2016-10-031-6/+6