Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jt/upload-pack-error-report' into maint | Junio C Hamano | 2017-03-21 | 1 | -1/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/sha1-file-plug-fallback-base-leak' into maint | Junio C Hamano | 2017-03-21 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ss/remote-bzr-hg-placeholder-wo-python' into maint | Junio C Hamano | 2017-03-21 | 2 | -18/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/diff-populate-filespec-size-only-fix' into maint | Junio C Hamano | 2017-03-21 | 2 | -1/+27 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/http-walker-buffer-underflow-fix' into maint | Junio C Hamano | 2017-03-21 | 1 | -4/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/status-porcelain-no-i18n' into maint | Junio C Hamano | 2017-03-21 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/docs-diffcore' into maint | Junio C Hamano | 2017-03-21 | 1 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ew/markdown-url-in-readme' into maint | Junio C Hamano | 2017-03-21 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rj/remove-unused-mktemp' into maint | Junio C Hamano | 2017-03-21 | 6 | -60/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/ewah-use-right-type-in-sizeof' into maint | Junio C Hamano | 2017-03-21 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sixth batch for 2.13 | Junio C Hamano | 2017-03-21 | 1 | -17/+23 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/commit-hook-doc-fix' | Junio C Hamano | 2017-03-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-commit.txt: list post-rewrite in HOOKS sectionnd/commit-hook-doc-fix | Nguyễn Thái Ngọc Duy | 2017-03-20 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/push-default-doc-fix' | Junio C Hamano | 2017-03-21 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | push: mention "push.default=tracking" in the documentationab/push-default-doc-fix | Ævar Arnfjörð Bjarmason | 2017-03-20 | 1 | -0/+2 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/doc-no-option-notation-fix' | Junio C Hamano | 2017-03-21 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: change erroneous --[no]-whatever into --[no-]whateverab/doc-no-option-notation-fix | Ævar Arnfjörð Bjarmason | 2017-03-20 | 2 | -2/+2 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/wt-status-cleanup' | Junio C Hamano | 2017-03-21 | 1 | -15/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |