Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' | Junio C Hamano | 2016-09-21 |
|\ | |||
| * | xdiff: fix merging of hunks with -W context and -u context | René Scharfe | 2016-09-14 |
| * | Merge branch 'sg/reflog-past-root' into maint | Junio C Hamano | 2016-09-08 |
| |\ | |||
| * \ | Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' into maint | Junio C Hamano | 2016-09-08 |
| |\ \ | |||
| * \ \ | Merge branch 'jk/difftool-command-not-found' into maint | Junio C Hamano | 2016-09-08 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'sb/checkout-explit-detach-no-advice' into maint | Junio C Hamano | 2016-09-08 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'rs/pull-signed-tag' into maint | Junio C Hamano | 2016-09-08 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'js/test-lint-pathname' into maint | Junio C Hamano | 2016-09-08 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'jk/push-force-with-lease-creation' into maint | Junio C Hamano | 2016-09-08 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'jk/reflog-date' into maint | Junio C Hamano | 2016-09-08 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint | Junio C Hamano | 2016-09-08 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/common-main' into maint | Junio C Hamano | 2016-09-08 |
| |\ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/setup-sequence-update' | Junio C Hamano | 2016-09-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | t1007: factor out repeated setup | Jeff King | 2016-09-13 |
| * | | | | | | | | | | | | init: reset cached config when entering new repo | Jeff King | 2016-09-13 |
| * | | | | | | | | | | | | config: only read .git/config from configured repos | Jeff King | 2016-09-13 |
| * | | | | | | | | | | | | t1302: use "git -C" | Jeff King | 2016-09-13 |
| * | | | | | | | | | | | | diff: always try to set up the repository | Jeff King | 2016-09-13 |
| * | | | | | | | | | | | | diff: handle --no-index prefixes consistently | Jeff King | 2016-09-13 |
| * | | | | | | | | | | | | patch-id: use RUN_SETUP_GENTLY | Jeff King | 2016-09-13 |
| * | | | | | | | | | | | | hash-object: always try to set up the git repository | Jeff King | 2016-09-13 |
* | | | | | | | | | | | | | Merge branch 'ks/pack-objects-bitmap' | Junio C Hamano | 2016-09-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | pack-objects: use reachability bitmap index when generating non-stdout pack | Kirill Smelkov | 2016-09-12 |
| * | | | | | | | | | | | | | pack-objects: respect --local/--honor-pack-keep/--incremental when bitmap is ... | Kirill Smelkov | 2016-09-12 |
* | | | | | | | | | | | | | | Merge branch 'js/cat-file-filters' | Junio C Hamano | 2016-09-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | cat-file: support --textconv/--filters in batch mode | Johannes Schindelin | 2016-09-11 |
| * | | | | | | | | | | | | | | cat-file --textconv/--filters: allow specifying the path separately | Johannes Schindelin | 2016-09-11 |
| * | | | | | | | | | | | | | | cat-file: introduce the --filters option | Johannes Schindelin | 2016-09-11 |
* | | | | | | | | | | | | | | | Merge branch 'jt/accept-capability-advertisement-when-fetching-from-void' | Junio C Hamano | 2016-09-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | connect: advertized capability is not a ref | Jonathan Tan | 2016-09-09 |
| * | | | | | | | | | | | | | | | tests: move test_lazy_prereq JGIT to test-lib.sh | Jonathan Tan | 2016-09-09 |
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2016-09-19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | cache: convert struct cache_entry to use struct object_id | brian m. carlson | 2016-09-07 |
* | | | | | | | | | | | | | | | | Merge branch 'cc/apply-am' | Junio C Hamano | 2016-09-19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | builtin/apply: make parse_single_patch() return -1 on error | Christian Couder | 2016-08-11 |
| * | | | | | | | | | | | | | | | | builtin/apply: make find_header() return -128 instead of die()ing | Christian Couder | 2016-08-11 |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/fix-remote-curl-url-wo-proto' | Junio C Hamano | 2016-09-15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | remote-curl: handle URLs without protocol | Jeff King | 2016-09-08 |
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | Merge branch 'jk/pack-tag-of-tag' | Junio C Hamano | 2016-09-15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | pack-objects: walk tag chains for --include-tag | Jeff King | 2016-09-07 |
| * | | | | | | | | | | | | | | | | | t5305: simplify packname handling | Jeff King | 2016-09-07 |
| * | | | | | | | | | | | | | | | | | t5305: use "git -C" | Jeff King | 2016-09-07 |
| * | | | | | | | | | | | | | | | | | t5305: drop "dry-run" of unpack-objects | Jeff King | 2016-09-07 |
| * | | | | | | | | | | | | | | | | | t5305: move cleanup into test block | Jeff King | 2016-09-07 |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | Merge branch 'ep/use-git-trace-curl-in-tests' | Junio C Hamano | 2016-09-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | t5551-http-fetch-smart.sh: use the GIT_TRACE_CURL environment var | Elia Pinto | 2016-09-07 |
| * | | | | | | | | | | | | | | | | | t5550-http-fetch-dumb.sh: use the GIT_TRACE_CURL environment var | Elia Pinto | 2016-09-07 |
| * | | | | | | | | | | | | | | | | | test-lib.sh: preserve GIT_TRACE_CURL from the environment | Elia Pinto | 2016-09-07 |
| * | | | | | | | | | | | | | | | | | t5541-http-push-smart.sh: use the GIT_TRACE_CURL environment var | Elia Pinto | 2016-09-07 |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | Merge branch 'js/t6026-clean-up' | Junio C Hamano | 2016-09-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |