Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fsck: handle bad trees like other errorsdt/tree-fsck | David Turner | 2016-09-27 | 1 | -2/+14 |
* | tree-walk: be more specific about corrupt tree errors | Jeff King | 2016-09-27 | 1 | -2/+23 |
* | Merge branch 'jk/rebase-i-drop-ident-check' | Junio C Hamano | 2016-09-21 | 1 | -0/+47 |
|\ | |||||
| * | rebase-interactive: drop early check for valid identjk/rebase-i-drop-ident-check | Jeff King | 2016-07-29 | 1 | -0/+47 |
* | | Merge branch 'va/i18n' | Junio C Hamano | 2016-09-21 | 2 | -3/+3 |
|\ \ | |||||
| * | | notes: spell first word of error messages in lowercase | Vasco Almeida | 2016-09-15 | 1 | -1/+1 |
| * | | i18n: blame: mark error messages for translation | Vasco Almeida | 2016-09-15 | 1 | -2/+2 |
* | | | Merge branch 'jt/format-patch-base-info-above-sig' | Junio C Hamano | 2016-09-21 | 1 | -6/+27 |
|\ \ \ | |||||
| * | | | format-patch: show base info before email signaturejt/format-patch-base-info-above-sig | Josh Triplett | 2016-09-15 | 1 | -6/+27 |
| |/ / | |||||
* | | | Merge branch 'ks/perf-build-with-autoconf' | Junio C Hamano | 2016-09-21 | 1 | -1/+7 |
|\ \ \ | |||||
| * | | | t/perf/run: copy config.mak.autogen & friends to build areaks/perf-build-with-autoconf | Kirill Smelkov | 2016-09-15 | 1 | -1/+7 |
| |/ / | |||||
* | | | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' | Junio C Hamano | 2016-09-21 | 1 | -0/+25 |
|\ \ \ | |||||
| * | | | xdiff: fix merging of hunks with -W context and -u contextrs/xdiff-merge-overlapping-hunks-for-W-context | René Scharfe | 2016-09-14 | 1 | -0/+25 |
| * | | | Merge branch 'sg/reflog-past-root' into maint | Junio C Hamano | 2016-09-08 | 1 | -1/+0 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' into maint | Junio C Hamano | 2016-09-08 | 1 | -0/+13 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/difftool-command-not-found' into maint | Junio C Hamano | 2016-09-08 | 1 | -0/+6 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'sb/checkout-explit-detach-no-advice' into maint | Junio C Hamano | 2016-09-08 | 1 | -0/+23 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'rs/pull-signed-tag' into maint | Junio C Hamano | 2016-09-08 | 1 | -0/+18 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'js/test-lint-pathname' into maint | Junio C Hamano | 2016-09-08 | 1 | -1/+10 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/push-force-with-lease-creation' into maint | Junio C Hamano | 2016-09-08 | 1 | -0/+38 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/reflog-date' into maint | Junio C Hamano | 2016-09-08 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint | Junio C Hamano | 2016-09-08 | 3 | -48/+59 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/common-main' into maint | Junio C Hamano | 2016-09-08 | 33 | -43/+43 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/setup-sequence-update' | Junio C Hamano | 2016-09-21 | 7 | -50/+130 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t1007: factor out repeated setupjk/setup-sequence-update | Jeff King | 2016-09-13 | 1 | -24/+8 |
| * | | | | | | | | | | | | | | init: reset cached config when entering new repo | Jeff King | 2016-09-13 | 1 | -0/+32 |
| * | | | | | | | | | | | | | | config: only read .git/config from configured repos | Jeff King | 2016-09-13 | 3 | -3/+19 |
| * | | | | | | | | | | | | | | t1302: use "git -C" | Jeff King | 2016-09-13 | 1 | -24/+6 |
| * | | | | | | | | | | | | | | diff: always try to set up the repository | Jeff King | 2016-09-13 | 1 | -0/+20 |
| * | | | | | | | | | | | | | | diff: handle --no-index prefixes consistently | Jeff King | 2016-09-13 | 1 | -0/+18 |
| * | | | | | | | | | | | | | | patch-id: use RUN_SETUP_GENTLY | Jeff King | 2016-09-13 | 1 | -0/+14 |
| * | | | | | | | | | | | | | | hash-object: always try to set up the git repository | Jeff King | 2016-09-13 | 1 | -0/+11 |
* | | | | | | | | | | | | | | | Merge branch 'ks/pack-objects-bitmap' | Junio C Hamano | 2016-09-21 | 2 | -1/+117 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | pack-objects: use reachability bitmap index when generating non-stdout packks/pack-objects-bitmap | Kirill Smelkov | 2016-09-12 | 2 | -1/+25 |
| * | | | | | | | | | | | | | | | pack-objects: respect --local/--honor-pack-keep/--incremental when bitmap is ... | Kirill Smelkov | 2016-09-12 | 1 | -0/+92 |
* | | | | | | | | | | | | | | | | Merge branch 'js/cat-file-filters' | Junio C Hamano | 2016-09-21 | 1 | -0/+64 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | cat-file: support --textconv/--filters in batch modejs/cat-file-filters | Johannes Schindelin | 2016-09-11 | 1 | -0/+10 |
| * | | | | | | | | | | | | | | | | cat-file --textconv/--filters: allow specifying the path separately | Johannes Schindelin | 2016-09-11 | 1 | -0/+20 |
| * | | | | | | | | | | | | | | | | cat-file: introduce the --filters option | Johannes Schindelin | 2016-09-11 | 1 | -0/+34 |
* | | | | | | | | | | | | | | | | | Merge branch 'jt/accept-capability-advertisement-when-fetching-from-void' | Junio C Hamano | 2016-09-21 | 3 | -4/+44 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | connect: advertized capability is not a refjt/accept-capability-advertisement-when-fetching-from-void | Jonathan Tan | 2016-09-09 | 1 | -0/+40 |
| * | | | | | | | | | | | | | | | | | tests: move test_lazy_prereq JGIT to test-lib.sh | Jonathan Tan | 2016-09-09 | 2 | -4/+4 |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2016-09-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | cache: convert struct cache_entry to use struct object_id | brian m. carlson | 2016-09-07 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'cc/apply-am' | Junio C Hamano | 2016-09-19 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | builtin/apply: make parse_single_patch() return -1 on error | Christian Couder | 2016-08-11 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | builtin/apply: make find_header() return -128 instead of die()ing | Christian Couder | 2016-08-11 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'jk/fix-remote-curl-url-wo-proto' | Junio C Hamano | 2016-09-15 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | remote-curl: handle URLs without protocoljk/fix-remote-curl-url-wo-proto | Jeff King | 2016-09-08 | 1 | -0/+8 |
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'jk/pack-tag-of-tag' | Junio C Hamano | 2016-09-15 | 1 | -29/+65 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |