summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* tests: lint for run-away here-docjc/lint-runaway-here-docJunio C Hamano2017-03-231-3/+3
* Merge branch 'js/rebase-helper'Junio C Hamano2017-03-231-1/+1
|\
| * sequencer: fix missing newlinejs/rebase-helperBrandon Williams2017-03-231-1/+1
* | Sync with maintJunio C Hamano2017-03-211-0/+61
|\ \
| * | Prepare for 2.12.2Junio C Hamano2017-03-212-1/+62
| * | Merge branch 'jh/send-email-one-cc' into maintJunio C Hamano2017-03-212-5/+4
| |\ \
| * \ \ Merge branch 'jk/t6300-cleanup' into maintJunio C Hamano2017-03-211-1/+1
| |\ \ \
| * \ \ \ Merge branch 'rs/commit-parsing-optim' into maintJunio C Hamano2017-03-211-12/+10
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/show-branch-lift-name-len-limit' into maintJunio C Hamano2017-03-211-29/+13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/tempfile-ferror-fclose-confusion' into maintJunio C Hamano2017-03-211-2/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rl/remote-allow-missing-branch-name-merge' into maintJunio C Hamano2017-03-212-1/+22
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dt/gc-ignore-old-gc-logs' into maintJunio C Hamano2017-03-213-7/+71
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jt/upload-pack-error-report' into maintJunio C Hamano2017-03-211-1/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/sha1-file-plug-fallback-base-leak' into maintJunio C Hamano2017-03-211-0/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ss/remote-bzr-hg-placeholder-wo-python' into maintJunio C Hamano2017-03-212-18/+14
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/diff-populate-filespec-size-only-fix' into maintJunio C Hamano2017-03-212-1/+27
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/http-walker-buffer-underflow-fix' into maintJunio C Hamano2017-03-211-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/status-porcelain-no-i18n' into maintJunio C Hamano2017-03-211-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/docs-diffcore' into maintJunio C Hamano2017-03-211-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/markdown-url-in-readme' into maintJunio C Hamano2017-03-211-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/remove-unused-mktemp' into maintJunio C Hamano2017-03-216-60/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/ewah-use-right-type-in-sizeof' into maintJunio C Hamano2017-03-211-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | Sixth batch for 2.13Junio C Hamano2017-03-211-17/+23
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/commit-hook-doc-fix'Junio C Hamano2017-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | git-commit.txt: list post-rewrite in HOOKS sectionnd/commit-hook-doc-fixNguyễn Thái Ngọc Duy2017-03-201-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/push-default-doc-fix'Junio C Hamano2017-03-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | push: mention "push.default=tracking" in the documentationab/push-default-doc-fixÆvar Arnfjörð Bjarmason2017-03-201-0/+2
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/doc-no-option-notation-fix'Junio C Hamano2017-03-212-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | doc: change erroneous --[no]-whatever into --[no-]whateverab/doc-no-option-notation-fixÆvar Arnfjörð Bjarmason2017-03-202-2/+2
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/wt-status-cleanup'Junio C Hamano2017-03-211-15/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | wt-status: simplify by using for_each_string_list_itemsb/wt-status-cleanupStefan Beller2017-03-171-15/+5
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'js/rebase-helper'Junio C Hamano2017-03-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | sequencer: drop "warning:" when stopping for editJeff King2017-03-171-1/+2
* | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/conditional-config-include'Junio C Hamano2017-03-213-8/+218
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | config: add conditional includeNguyễn Thái Ngọc Duy2017-03-113-1/+212
| * | | | | | | | | | | | | | | | | | | | | config.txt: reflow the second include.path paragraphNguyễn Thái Ngọc Duy2017-03-111-5/+4
| * | | | | | | | | | | | | | | | | | | | | config.txt: clarify multiple key values in include.pathNguyễn Thái Ngọc Duy2017-03-111-2/+2
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/pack-name-cleanups'Junio C Hamano2017-03-216-46/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | index-pack: make pointer-alias fallbacks saferjk/pack-name-cleanupsJeff King2017-03-161-8/+12
| * | | | | | | | | | | | | | | | | | | | | | replace snprintf with odb_pack_name()Jeff King2017-03-162-31/+24
| * | | | | | | | | | | | | | | | | | | | | | odb_pack_keep(): stop generating keepfile nameJeff King2017-03-164-12/+12
| * | | | | | | | | | | | | | | | | | | | | | sha1_file.c: make pack-name helper globally accessibleJeff King2017-03-162-11/+15
| * | | | | | | | | | | | | | | | | | | | | | move odb_* declarations out of git-compat-util.hJeff King2017-03-162-2/+12
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-config-parse-ignore-fix'Junio C Hamano2017-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | submodule-config: correct error reporting for invalid ignore valuesb/submodule-config-parse-ignore-fixStefan Beller2017-03-151-1/+1
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/prompt-describe-tags'Junio C Hamano2017-03-211-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | git-prompt: add a describe style for any tagsmg/prompt-describe-tagsMichael J Gruber2017-03-151-0/+3
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rev-parse-cleanup'Junio C Hamano2017-03-211-52/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | rev-parse: simplify parsing of ref optionsjk/rev-parse-cleanupJeff King2017-03-151-29/+16
| * | | | | | | | | | | | | | | | | | | | | | | rev-parse: add helper for parsing "--foo/--foo="Jeff King2017-03-151-10/+28