summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | t6031: generalize for recursive and resolve strategiesJeff King2015-10-262-56/+77
| * | | | | | | | t6031: move triple-rename test to t3030Jeff King2015-10-262-31/+30
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'js/imap-send-curl-compilation-fix' into maintJunio C Hamano2015-11-051-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually availablejs/imap-send-curl-compilation-fixJohannes Schindelin2015-10-261-0/+4
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'rp/link-curl-before-ssl' into maintJunio C Hamano2015-11-052-6/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | configure.ac: detect ssl need with libcurlrp/link-curl-before-sslRemi Pommarel2015-10-211-0/+10
| * | | | | | | | Makefile: make curl-config path configurableRemi Pommarel2015-10-212-2/+19
| * | | | | | | | Makefile: link libcurl before zlibRemi Pommarel2015-10-211-4/+5
* | | | | | | | | Merge branch 'nd/clone-linked-checkout' into maintJunio C Hamano2015-11-054-8/+66
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clone: better error when --reference is a linked checkoutnd/clone-linked-checkoutNguyễn Thái Ngọc Duy2015-09-281-1/+6
| * | | | | | | | | clone: allow --local from a linked checkoutNguyễn Thái Ngọc Duy2015-09-282-2/+9
| * | | | | | | | | enter_repo: allow .git files in strict modeNguyễn Thái Ngọc Duy2015-09-282-2/+17
| * | | | | | | | | enter_repo: avoid duplicating logic, use is_git_directory() insteadNguyễn Thái Ngọc Duy2015-09-282-2/+15
| * | | | | | | | | t0002: add test for enter_repo(), non-strict modeNguyễn Thái Ngọc Duy2015-09-281-0/+18
| * | | | | | | | | path.c: delete an extra spaceNguyễn Thái Ngọc Duy2015-09-071-1/+1
* | | | | | | | | | Merge branch 'sa/send-email-smtp-batch-data-limit' into maintJunio C Hamano2015-11-051-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-send-email.perl: Fixed sending of many/huge changes/patchessa/send-email-smtp-batch-data-limitStefan Agner2015-09-301-1/+5
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'xf/user-manual-ff' into maintJunio C Hamano2015-11-041-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | user-manual: fix the description of fast-forwardxf/user-manual-ffXue Fuqiao2015-10-261-5/+5
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'xf/user-manual-markup' into maintJunio C Hamano2015-11-0411-11/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation: match undefline with the text in old release notesxf/user-manual-markupJunio C Hamano2015-10-225-5/+5
| * | | | | | | | | | Documentation: match underline with the textJunio C Hamano2015-10-225-5/+5
| * | | | | | | | | | Documentation: fix header markupXue Fuqiao2015-10-221-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jc/everyday-markup' into maintJunio C Hamano2015-11-041-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/everyday: match undefline with the textjc/everyday-markupJunio C Hamano2015-10-221-1/+1
* | | | | | | | | | | Merge branch 'jc/em-dash-in-doc' into maintJunio C Hamano2015-11-046-6/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation: AsciiDoc spells em-dash as double-dashes, not triplejc/em-dash-in-docJunio C Hamano2015-10-226-6/+6
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'es/worktree-add' into maintJunio C Hamano2015-11-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | worktree: usage: denote <branch> as optional with 'add'es/worktree-addSidhant Sharma2015-10-181-1/+1
* | | | | | | | | | | | Merge branch 'mk/blame-error-message' into maintJunio C Hamano2015-11-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | blame: fix option name in error messagemk/blame-error-messageMax Kirillov2015-10-261-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/merge-file-exit-code' into maintJunio C Hamano2015-11-033-1/+38
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | merge-file: clamp exit code to maximum 127jk/merge-file-exit-codeJeff King2015-10-293-1/+38
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'dt/name-hash-dir-entry-fix' into maintJunio C Hamano2015-11-034-60/+35
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | name-hash: don't reuse cache_entry in dir_entrydt/name-hash-dir-entry-fixDavid Turner2015-10-214-60/+35
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/am-3-fallback-regression-fix' into maintJunio C Hamano2015-11-031-16/+33
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | am -3: do not let failed merge from completing the error codepathjc/am-3-fallback-regression-fixJunio C Hamano2015-10-091-16/+33
* | | | | | | | | | | | | Merge branch 'jc/usage-stdin' into maintJunio C Hamano2015-11-0325-41/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | usage: do not insist that standard input must come from a filejc/usage-stdinJunio C Hamano2015-10-1625-41/+64
* | | | | | | | | | | | | | Merge branch 'rt/placeholder-in-usage' into maintJunio C Hamano2015-11-032-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | am, credential-cache: add angle brackets to usage stringrt/placeholder-in-usageRalf Thielow2015-10-162-3/+3
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'dt/t7063-fix-flaky-test' into maintJunio C Hamano2015-11-031-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t7063: fix flaky untracked-cache testdt/t7063-fix-flaky-testDavid Turner2015-10-191-1/+3
* | | | | | | | | | | | | | | Merge branch 'mk/submodule-gitdir-path' into maintJunio C Hamano2015-11-035-17/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | path: implement common_dir handling in git_pathdup_submodule()mk/submodule-gitdir-pathMax Kirillov2015-09-144-9/+41
| * | | | | | | | | | | | | | | submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()Max Kirillov2015-09-141-8/+1
* | | | | | | | | | | | | | | | Merge branch 'nd/gc-auto-background-fix' into maintJunio C Hamano2015-11-031-1/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | gc: save log from daemonized gc --auto and print it next timend/gc-auto-background-fixNguyễn Thái Ngọc Duy2015-09-211-1/+55
* | | | | | | | | | | | | | | | | Merge branch 'ls/p4-translation-failure' into maintJunio C Hamano2015-11-032-11/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | git-p4: handle "Translation of file content failed"ls/p4-translation-failureLars Schneider2015-09-222-12/+17