Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | stash: allow stashes to be referenced by index onlyaw/numbered-stash | Aaron M Watson | 2016-10-26 | 3 | -3/+50 |
* | Sync with maint | Junio C Hamano | 2016-10-17 | 2 | -2417/+2813 |
|\ | |||||
| * | Merge tag 'l10n-2.10.0-rnd2.4' of git://github.com/git-l10n/git-po into maint | Junio C Hamano | 2016-10-17 | 2 | -2417/+2813 |
| |\ | |||||
| | * | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru | Jiang Xin | 2016-10-16 | 1 | -26/+26 |
| | |\ | |||||
| | | * | l10n: ru.po: update Russian translation | Dimitriy Ryazantcev | 2016-07-12 | 1 | -26/+26 |
| | * | | l10n: de.po: translate 260 new messages | Ralf Thielow | 2016-10-12 | 1 | -2387/+2783 |
| | * | | l10n: de.po: fix translation of autostash | Ralf Thielow | 2016-09-12 | 1 | -4/+4 |
* | | | | Tenth batch for 2.11 | Junio C Hamano | 2016-10-17 | 1 | -16/+49 |
* | | | | Merge branch 'sb/submodule-config-doc-drop-path' | Junio C Hamano | 2016-10-17 | 1 | -5/+6 |
|\ \ \ \ | |||||
| * | | | | documentation: improve submodule.<name>.{url, path} descriptionsb/submodule-config-doc-drop-path | Stefan Beller | 2016-10-11 | 1 | -5/+6 |
* | | | | | Merge branch 'rs/pretty-format-color-doc-fix' | Junio C Hamano | 2016-10-17 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | pretty: fix document link for color specificationrs/pretty-format-color-doc-fix | René Scharfe | 2016-10-11 | 1 | -1/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'js/reset-usage' | Junio C Hamano | 2016-10-17 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | reset: fix usagejs/reset-usage | Johannes Schindelin | 2016-10-11 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'da/mergetool-diff-order' | Junio C Hamano | 2016-10-17 | 3 | -86/+165 |
|\ \ \ \ \ | |||||
| * | | | | | mergetool: honor -O<orderfile>da/mergetool-diff-order | David Aguilar | 2016-10-11 | 3 | -6/+40 |
| * | | | | | mergetool: honor diff.orderFile | David Aguilar | 2016-10-11 | 3 | -15/+53 |
| * | | | | | mergetool: move main program flow into a main() function | David Aguilar | 2016-10-11 | 1 | -87/+93 |
| * | | | | | mergetool: add copyright | David Aguilar | 2016-10-11 | 1 | -0/+1 |
* | | | | | | Merge branch 'rs/cocci' | Junio C Hamano | 2016-10-17 | 6 | -22/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | use strbuf_add_unique_abbrev() for adding short hashes, part 3 | René Scharfe | 2016-10-10 | 4 | -20/+15 |
| * | | | | | | remove unnecessary NULL check before free(3) | René Scharfe | 2016-10-10 | 2 | -2/+6 |
* | | | | | | | Merge branch 'js/regexec-buf' | Junio C Hamano | 2016-10-17 | 1 | -6/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | configure.ac: improve description of NO_REGEX test | Jakub Narębski | 2016-10-10 | 1 | -6/+7 |
* | | | | | | | | Merge branch 'jk/ref-symlink-loop' | Junio C Hamano | 2016-10-17 | 2 | -1/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | files_read_raw_ref: prevent infinite retry loops in generaljk/ref-symlink-loop | Jeff King | 2016-10-10 | 1 | -0/+7 |
| * | | | | | | | | files_read_raw_ref: avoid infinite loop on broken symlinks | Jeff King | 2016-10-10 | 2 | -1/+11 |
* | | | | | | | | | Merge branch 'jk/quarantine-received-objects' | Junio C Hamano | 2016-10-17 | 8 | -1/+413 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | tmp-objdir: do not migrate files starting with '.' | Jeff King | 2016-10-10 | 1 | -1/+1 |
| * | | | | | | | | | tmp-objdir: put quarantine information in the environment | Jeff King | 2016-10-10 | 2 | -0/+3 |
| * | | | | | | | | | receive-pack: quarantine objects until pre-receive accepts | Jeff King | 2016-10-10 | 2 | -1/+76 |
| * | | | | | | | | | tmp-objdir: introduce API for temporary object directories | Jeff King | 2016-10-10 | 3 | -0/+328 |
| * | | | | | | | | | check_connected: accept an env argument | Jeff King | 2016-10-10 | 2 | -0/+6 |
* | | | | | | | | | | Merge branch 'jk/alt-odb-cleanup' | Junio C Hamano | 2016-10-17 | 12 | -222/+308 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | alternates: use fspathcmp to detect duplicates | Jeff King | 2016-10-10 | 3 | -1/+20 |
| * | | | | | | | | | sha1_file: always allow relative paths to alternates | Jeff King | 2016-10-10 | 2 | -8/+23 |
| * | | | | | | | | | count-objects: report alternates via verbose mode | Jeff King | 2016-10-10 | 3 | -0/+25 |
| * | | | | | | | | | fill_sha1_file: write into a strbuf | Jeff King | 2016-10-10 | 1 | -24/+10 |
| * | | | | | | | | | alternates: store scratch buffer as strbuf | Jeff King | 2016-10-10 | 3 | -18/+32 |
| * | | | | | | | | | fill_sha1_file: write "boring" characters | Jeff King | 2016-10-10 | 1 | -7/+5 |
| * | | | | | | | | | alternates: use a separate scratch space | Jeff King | 2016-10-10 | 6 | -37/+24 |
| * | | | | | | | | | alternates: encapsulate alt->base munging | Jeff King | 2016-10-10 | 1 | -6/+13 |
| * | | | | | | | | | alternates: provide helper for allocating alternate | Jeff King | 2016-10-10 | 3 | -15/+26 |
| * | | | | | | | | | alternates: provide helper for adding to alternates list | Jeff King | 2016-10-10 | 3 | -23/+25 |
| * | | | | | | | | | link_alt_odb_entry: refactor string handling | Jeff King | 2016-10-10 | 1 | -38/+45 |
| * | | | | | | | | | link_alt_odb_entry: handle normalize_path errors | Jeff King | 2016-10-10 | 3 | -2/+37 |
| * | | | | | | | | | t5613: clarify "too deep" recursion tests | Jeff King | 2016-10-10 | 1 | -8/+19 |
| * | | | | | | | | | t5613: do not chdir in main process | Jeff King | 2016-10-03 | 1 | -59/+33 |
| * | | | | | | | | | t5613: whitespace/style cleanups | Jeff King | 2016-10-03 | 1 | -52/+62 |
| * | | | | | | | | | t5613: use test_must_fail | Jeff King | 2016-10-03 | 1 | -6/+6 |