Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'da/mergetool-diff-order' | Junio C Hamano | 2016-10-17 |
|\ | |||
| * | mergetool: honor -O<orderfile> | David Aguilar | 2016-10-11 |
| * | mergetool: honor diff.orderFile | David Aguilar | 2016-10-11 |
* | | Merge branch 'jk/ref-symlink-loop' | Junio C Hamano | 2016-10-17 |
|\ \ | |||
| * | | files_read_raw_ref: avoid infinite loop on broken symlinks | Jeff King | 2016-10-10 |
| * | | Merge branch 'jk/pack-tag-of-tag' into maint | Junio C Hamano | 2016-10-03 |
| |\ \ | |||
| * \ \ | Merge branch 'tg/add-chmod+x-fix' into maint | Junio C Hamano | 2016-09-29 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'rt/rebase-i-broken-insn-advise' into maint | Junio C Hamano | 2016-09-29 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'js/regexec-buf' into maint | Junio C Hamano | 2016-09-29 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'nd/checkout-disambiguation' into maint | Junio C Hamano | 2016-09-29 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'jk/rebase-i-drop-ident-check' into maint | Junio C Hamano | 2016-09-29 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'jt/format-patch-base-info-above-sig' into maint | Junio C Hamano | 2016-09-29 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'ks/perf-build-with-autoconf' into maint | Junio C Hamano | 2016-09-29 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maint | Junio C Hamano | 2016-09-29 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/fix-remote-curl-url-wo-proto' into maint | Junio C Hamano | 2016-09-29 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/quarantine-received-objects' | Junio C Hamano | 2016-10-17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | receive-pack: quarantine objects until pre-receive accepts | Jeff King | 2016-10-10 |
* | | | | | | | | | | | | | | Merge branch 'jk/alt-odb-cleanup' | Junio C Hamano | 2016-10-17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||
| * | | | | | | | | | | | | | alternates: use fspathcmp to detect duplicates | Jeff King | 2016-10-10 |
| * | | | | | | | | | | | | | sha1_file: always allow relative paths to alternates | Jeff King | 2016-10-10 |
| * | | | | | | | | | | | | | count-objects: report alternates via verbose mode | Jeff King | 2016-10-10 |
| * | | | | | | | | | | | | | t5613: clarify "too deep" recursion tests | Jeff King | 2016-10-10 |
| * | | | | | | | | | | | | | t5613: do not chdir in main process | Jeff King | 2016-10-03 |
| * | | | | | | | | | | | | | t5613: whitespace/style cleanups | Jeff King | 2016-10-03 |
| * | | | | | | | | | | | | | t5613: use test_must_fail | Jeff King | 2016-10-03 |
| * | | | | | | | | | | | | | t5613: drop test_valid_repo function | Jeff King | 2016-10-03 |
| * | | | | | | | | | | | | | t5613: drop reachable_via function | Jeff King | 2016-10-03 |
* | | | | | | | | | | | | | | Merge branch 'nd/shallow-deepen' | Junio C Hamano | 2016-10-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | fetch, upload-pack: --deepen=N extends shallow boundary by N commits | Nguyễn Thái Ngọc Duy | 2016-06-13 |
| * | | | | | | | | | | | | | | t5500, t5539: tests for shallow depth excluding a ref | Nguyễn Thái Ngọc Duy | 2016-06-13 |
| * | | | | | | | | | | | | | | t5500, t5539: tests for shallow depth since a specific date | Nguyễn Thái Ngọc Duy | 2016-06-13 |
* | | | | | | | | | | | | | | | Merge branch 'jk/pack-objects-optim-mru' | Junio C Hamano | 2016-10-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | pack-objects: break delta cycles before delta-search phase | Jeff King | 2016-08-11 |
* | | | | | | | | | | | | | | | | Merge branch 'rs/qsort' | Junio C Hamano | 2016-10-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | use QSORT | René Scharfe | 2016-09-29 |
* | | | | | | | | | | | | | | | | Merge branch 'rs/c-auto-resets-attributes' | Junio C Hamano | 2016-10-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | pretty: avoid adding reset for %C(auto) if output is empty | René Scharfe | 2016-09-29 |
* | | | | | | | | | | | | | | | | | Merge branch 'vn/revision-shorthand-for-side-branch-log' | Junio C Hamano | 2016-10-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | revision: new rev^-n shorthand for rev^n..rev | Vegard Nossum | 2016-09-27 |
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | Merge branch 'jk/ambiguous-short-object-names' | Junio C Hamano | 2016-10-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | get_short_sha1: make default disambiguation configurable | Jeff King | 2016-09-27 |
| * | | | | | | | | | | | | | | | | get_short_sha1: list ambiguous objects on error | Jeff King | 2016-09-26 |
| * | | | | | | | | | | | | | | | | for_each_abbrev: drop duplicate objects | Jeff King | 2016-09-26 |
| * | | | | | | | | | | | | | | | | sha1_array: let callbacks interrupt iteration | Jeff King | 2016-09-26 |
| * | | | | | | | | | | | | | | | | get_short_sha1: parse tags when looking for treeish | Jeff King | 2016-09-26 |
| * | | | | | | | | | | | | | | | | get_sha1: propagate flags to child functions | Jeff King | 2016-09-26 |
| * | | | | | | | | | | | | | | | | get_sha1: avoid repeating ourselves via ONLY_TO_DIE | Jeff King | 2016-09-26 |
* | | | | | | | | | | | | | | | | | Merge branch 'dt/tree-fsck' | Junio C Hamano | 2016-10-03 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | fsck: handle bad trees like other errors | David Turner | 2016-09-27 |
| * | | | | | | | | | | | | | | | | | tree-walk: be more specific about corrupt tree errors | Jeff King | 2016-09-27 |
| |/ / / / / / / / / / / / / / / / |