Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | tests: lint for run-away here-docjc/lint-runaway-here-doc | Junio C Hamano | 2017-03-23 | 1 | -3/+3 |
* | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | wt-status: simplify by using for_each_string_list_itemsb/wt-status-cleanup | Stefan Beller | 2017-03-17 | 1 | -15/+5 |
| |/ / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/rebase-helper' | Junio C Hamano | 2017-03-21 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | sequencer: drop "warning:" when stopping for edit | Jeff King | 2017-03-17 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/conditional-config-include' | Junio C Hamano | 2017-03-21 | 3 | -8/+218 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | config: add conditional include | Nguyễn Thái Ngọc Duy | 2017-03-11 | 3 | -1/+212 |
| * | | | | | | | | | | | | | | | | | | | | | config.txt: reflow the second include.path paragraph | Nguyễn Thái Ngọc Duy | 2017-03-11 | 1 | -5/+4 |
| * | | | | | | | | | | | | | | | | | | | | | config.txt: clarify multiple key values in include.path | Nguyễn Thái Ngọc Duy | 2017-03-11 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/pack-name-cleanups' | Junio C Hamano | 2017-03-21 | 6 | -46/+57 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | index-pack: make pointer-alias fallbacks saferjk/pack-name-cleanups | Jeff King | 2017-03-16 | 1 | -8/+12 |
| * | | | | | | | | | | | | | | | | | | | | | | replace snprintf with odb_pack_name() | Jeff King | 2017-03-16 | 2 | -31/+24 |
| * | | | | | | | | | | | | | | | | | | | | | | odb_pack_keep(): stop generating keepfile name | Jeff King | 2017-03-16 | 4 | -12/+12 |
| * | | | | | | | | | | | | | | | | | | | | | | sha1_file.c: make pack-name helper globally accessible | Jeff King | 2017-03-16 | 2 | -11/+15 |
| * | | | | | | | | | | | | | | | | | | | | | | move odb_* declarations out of git-compat-util.h | Jeff King | 2017-03-16 | 2 | -2/+12 |
| |/ / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-config-parse-ignore-fix' | Junio C Hamano | 2017-03-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | submodule-config: correct error reporting for invalid ignore valuesb/submodule-config-parse-ignore-fix | Stefan Beller | 2017-03-15 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/prompt-describe-tags' | Junio C Hamano | 2017-03-21 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | git-prompt: add a describe style for any tagsmg/prompt-describe-tags | Michael J Gruber | 2017-03-15 | 1 | -0/+3 |
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rev-parse-cleanup' | Junio C Hamano | 2017-03-21 | 1 | -52/+57 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | rev-parse: simplify parsing of ref optionsjk/rev-parse-cleanup | Jeff King | 2017-03-15 | 1 | -29/+16 |
| * | | | | | | | | | | | | | | | | | | | | | | | rev-parse: add helper for parsing "--foo/--foo=" | Jeff King | 2017-03-15 | 1 | -10/+28 |