Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rev-parse: match @{upstream}, @{u} and @{push} case-insensitivelyab/case-insensitive-upstream-and-push-marker | Ævar Arnfjörð Bjarmason | 2017-03-27 | 4 | -8/+23 |
* | Sync with 2.12.2 | Junio C Hamano | 2017-03-24 | 3 | -2/+26 |
|\ | |||||
| * | Git 2.12.2v2.12.2 | Junio C Hamano | 2017-03-24 | 3 | -2/+25 |
| * | Merge branch 'ab/doc-no-option-notation-fix' into maint | Junio C Hamano | 2017-03-24 | 2 | -2/+2 |
| |\ | |||||
| * \ | Merge branch 'ab/push-default-doc-fix' into maint | Junio C Hamano | 2017-03-24 | 1 | -0/+2 |
| |\ \ | |||||
| * \ \ | Merge branch 'nd/commit-hook-doc-fix' into maint | Junio C Hamano | 2017-03-24 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jc/config-case-cmdline-take-2' into maint | Junio C Hamano | 2017-03-24 | 2 | -97/+163 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/grep-no-index-fix' into maint | Junio C Hamano | 2017-03-24 | 2 | -27/+121 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jn/remote-helpers-with-git-dir' into maint | Junio C Hamano | 2017-03-24 | 4 | -3/+22 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'sb/submodule-config-parse-ignore-fix' into maint | Junio C Hamano | 2017-03-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/push-deadlock-regression-fix' into maint | Junio C Hamano | 2017-03-24 | 2 | -11/+40 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | mailmap: use Michael J Gruber's new addressmg/mailmap | Michael J Gruber | 2017-03-24 | 1 | -1/+2 |
* | | | | | | | | | | Seventh batch for 2.13 | Junio C Hamano | 2017-03-24 | 1 | -9/+29 |
* | | | | | | | | | | Merge branch 'jk/sha1dc' | Junio C Hamano | 2017-03-24 | 9 | -2/+2405 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Makefile: make DC_SHA1 the default | Junio C Hamano | 2017-03-17 | 1 | -6/+10 |
| * | | | | | | | | | | t0013: add a basic sha1 collision detection test | Jeff King | 2017-03-17 | 3 | -0/+20 |
| * | | | | | | | | | | Makefile: add DC_SHA1 knob | Jeff King | 2017-03-17 | 4 | -0/+47 |
| * | | | | | | | | | | sha1dc: disable safe_hash feature | Jeff King | 2017-03-16 | 1 | -1/+1 |
| * | | | | | | | | | | sha1dc: adjust header includes for git | Jeff King | 2017-03-16 | 4 | -13/+9 |
| * | | | | | | | | | | sha1dc: add collision-detecting sha1 implementation | Jeff King | 2017-03-16 | 5 | -0/+2336 |
* | | | | | | | | | | | Merge branch 'sg/test-with-stdin' | Junio C Hamano | 2017-03-24 | 2 | -8/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | tests: make the 'test_pause' helper work in non-verbose modesg/test-with-stdin | SZEDER Gábor | 2017-03-18 | 1 | -7/+2 |
| * | | | | | | | | | | | tests: create an interactive gdb session with the 'debug' helper | SZEDER Gábor | 2017-03-18 | 2 | -1/+2 |
* | | | | | | | | | | | | Merge branch 'rs/update-hook-optim' | Junio C Hamano | 2017-03-24 | 1 | -8/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | receive-pack: simplify run_update_post_hook()rs/update-hook-optim | René Scharfe | 2017-03-18 | 1 | -8/+5 |
* | | | | | | | | | | | | | Merge branch 'rs/shortlog-cleanup' | Junio C Hamano | 2017-03-24 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | shortlog: don't set after_subject to an empty stringrs/shortlog-cleanup | René Scharfe | 2017-03-18 | 1 | -1/+0 |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'rs/path-name-safety-cleanup' | Junio C Hamano | 2017-03-24 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | revision: remove declaration of path_name()rs/path-name-safety-cleanup | René Scharfe | 2017-03-18 | 1 | -2/+0 |
* | | | | | | | | | | | | | | Merge branch 'rs/http-push-cleanup' | Junio C Hamano | 2017-03-24 | 1 | -5/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | http-push: don't check return value of lookup_unknown_object()rs/http-push-cleanup | René Scharfe | 2017-03-18 | 1 | -5/+3 |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'js/regexec-buf' | Junio C Hamano | 2017-03-24 | 2 | -2/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | pickaxe: fix segfault with '-S<...> --pickaxe-regex'js/regexec-buf | SZEDER Gábor | 2017-03-18 | 2 | -2/+10 |
* | | | | | | | | | | | | | | | Merge branch 'jk/execv-dashed-external' | Junio C Hamano | 2017-03-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | run-command: fix segfault when cleaning forked async processjk/execv-dashed-external | Jeff King | 2017-03-18 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'dl/credential-cache-socket-in-xdg-cache' | Junio C Hamano | 2017-03-24 | 5 | -5/+136 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | credential-cache: add tests for XDG functionality | Devin Lehmacher | 2017-03-17 | 1 | -0/+93 |
| * | | | | | | | | | | | | | | | | credential-cache: use XDG_CACHE_HOME for socket | Devin Lehmacher | 2017-03-17 | 2 | -5/+21 |
| * | | | | | | | | | | | | | | | | path.c: add xdg_cache_home | Devin Lehmacher | 2017-03-13 | 2 | -0/+22 |
* | | | | | | | | | | | | | | | | | Merge branch 'js/rebase-helper' | Junio C Hamano | 2017-03-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | sequencer: fix missing newlinejs/rebase-helper | Brandon Williams | 2017-03-23 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2017-03-21 | 1 | -0/+61 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Prepare for 2.12.2 | Junio C Hamano | 2017-03-21 | 2 | -1/+62 |
| * | | | | | | | | | | | | | | | | | Merge branch 'jh/send-email-one-cc' into maint | Junio C Hamano | 2017-03-21 | 2 | -5/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/t6300-cleanup' into maint | Junio C Hamano | 2017-03-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/commit-parsing-optim' into maint | Junio C Hamano | 2017-03-21 | 1 | -12/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/show-branch-lift-name-len-limit' into maint | Junio C Hamano | 2017-03-21 | 1 | -29/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/tempfile-ferror-fclose-confusion' into maint | Junio C Hamano | 2017-03-21 | 1 | -2/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rl/remote-allow-missing-branch-name-merge' into maint | Junio C Hamano | 2017-03-21 | 2 | -1/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dt/gc-ignore-old-gc-logs' into maint | Junio C Hamano | 2017-03-21 | 3 | -7/+71 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |