Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | merge: detect delete/modechange conflictjk/delete-modechange-conflict | Jeff King | 2015-10-26 | 3 | -2/+37 | |
| * | | | | | | | | t6031: generalize for recursive and resolve strategies | Jeff King | 2015-10-26 | 2 | -56/+77 | |
| * | | | | | | | | t6031: move triple-rename test to t3030 | Jeff King | 2015-10-26 | 2 | -31/+30 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'js/imap-send-curl-compilation-fix' into maint | Junio C Hamano | 2015-11-05 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually availablejs/imap-send-curl-compilation-fix | Johannes Schindelin | 2015-10-26 | 1 | -0/+4 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'rp/link-curl-before-ssl' into maint | Junio C Hamano | 2015-11-05 | 2 | -6/+34 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | configure.ac: detect ssl need with libcurlrp/link-curl-before-ssl | Remi Pommarel | 2015-10-21 | 1 | -0/+10 | |
| * | | | | | | | | Makefile: make curl-config path configurable | Remi Pommarel | 2015-10-21 | 2 | -2/+19 | |
| * | | | | | | | | Makefile: link libcurl before zlib | Remi Pommarel | 2015-10-21 | 1 | -4/+5 | |
* | | | | | | | | | Merge branch 'nd/clone-linked-checkout' into maint | Junio C Hamano | 2015-11-05 | 4 | -8/+66 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | clone: better error when --reference is a linked checkoutnd/clone-linked-checkout | Nguyễn Thái Ngọc Duy | 2015-09-28 | 1 | -1/+6 | |
| * | | | | | | | | | clone: allow --local from a linked checkout | Nguyễn Thái Ngọc Duy | 2015-09-28 | 2 | -2/+9 | |
| * | | | | | | | | | enter_repo: allow .git files in strict mode | Nguyễn Thái Ngọc Duy | 2015-09-28 | 2 | -2/+17 | |
| * | | | | | | | | | enter_repo: avoid duplicating logic, use is_git_directory() instead | Nguyễn Thái Ngọc Duy | 2015-09-28 | 2 | -2/+15 | |
| * | | | | | | | | | t0002: add test for enter_repo(), non-strict mode | Nguyễn Thái Ngọc Duy | 2015-09-28 | 1 | -0/+18 | |
| * | | | | | | | | | path.c: delete an extra space | Nguyễn Thái Ngọc Duy | 2015-09-07 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch 'sa/send-email-smtp-batch-data-limit' into maint | Junio C Hamano | 2015-11-05 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | git-send-email.perl: Fixed sending of many/huge changes/patchessa/send-email-smtp-batch-data-limit | Stefan Agner | 2015-09-30 | 1 | -1/+5 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'xf/user-manual-ff' into maint | Junio C Hamano | 2015-11-04 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | user-manual: fix the description of fast-forwardxf/user-manual-ff | Xue Fuqiao | 2015-10-26 | 1 | -5/+5 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'xf/user-manual-markup' into maint | Junio C Hamano | 2015-11-04 | 11 | -11/+11 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Documentation: match undefline with the text in old release notesxf/user-manual-markup | Junio C Hamano | 2015-10-22 | 5 | -5/+5 | |
| * | | | | | | | | | | Documentation: match underline with the text | Junio C Hamano | 2015-10-22 | 5 | -5/+5 | |
| * | | | | | | | | | | Documentation: fix header markup | Xue Fuqiao | 2015-10-22 | 1 | -1/+1 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'jc/everyday-markup' into maint | Junio C Hamano | 2015-11-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Documentation/everyday: match undefline with the textjc/everyday-markup | Junio C Hamano | 2015-10-22 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge branch 'jc/em-dash-in-doc' into maint | Junio C Hamano | 2015-11-04 | 6 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Documentation: AsciiDoc spells em-dash as double-dashes, not triplejc/em-dash-in-doc | Junio C Hamano | 2015-10-22 | 6 | -6/+6 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'es/worktree-add' into maint | Junio C Hamano | 2015-11-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | worktree: usage: denote <branch> as optional with 'add'es/worktree-add | Sidhant Sharma | 2015-10-18 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge branch 'mk/blame-error-message' into maint | Junio C Hamano | 2015-11-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | blame: fix option name in error messagemk/blame-error-message | Max Kirillov | 2015-10-26 | 1 | -1/+1 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jk/merge-file-exit-code' into maint | Junio C Hamano | 2015-11-03 | 3 | -1/+38 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | merge-file: clamp exit code to maximum 127jk/merge-file-exit-code | Jeff King | 2015-10-29 | 3 | -1/+38 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'dt/name-hash-dir-entry-fix' into maint | Junio C Hamano | 2015-11-03 | 4 | -60/+35 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | name-hash: don't reuse cache_entry in dir_entrydt/name-hash-dir-entry-fix | David Turner | 2015-10-21 | 4 | -60/+35 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jc/am-3-fallback-regression-fix' into maint | Junio C Hamano | 2015-11-03 | 1 | -16/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | am -3: do not let failed merge from completing the error codepathjc/am-3-fallback-regression-fix | Junio C Hamano | 2015-10-09 | 1 | -16/+33 | |
* | | | | | | | | | | | | | Merge branch 'jc/usage-stdin' into maint | Junio C Hamano | 2015-11-03 | 25 | -41/+64 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | usage: do not insist that standard input must come from a filejc/usage-stdin | Junio C Hamano | 2015-10-16 | 25 | -41/+64 | |
* | | | | | | | | | | | | | | Merge branch 'rt/placeholder-in-usage' into maint | Junio C Hamano | 2015-11-03 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | am, credential-cache: add angle brackets to usage stringrt/placeholder-in-usage | Ralf Thielow | 2015-10-16 | 2 | -3/+3 | |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'dt/t7063-fix-flaky-test' into maint | Junio C Hamano | 2015-11-03 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | t7063: fix flaky untracked-cache testdt/t7063-fix-flaky-test | David Turner | 2015-10-19 | 1 | -1/+3 | |
* | | | | | | | | | | | | | | | Merge branch 'mk/submodule-gitdir-path' into maint | Junio C Hamano | 2015-11-03 | 5 | -17/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | path: implement common_dir handling in git_pathdup_submodule()mk/submodule-gitdir-path | Max Kirillov | 2015-09-14 | 4 | -9/+41 | |
| * | | | | | | | | | | | | | | | submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb() | Max Kirillov | 2015-09-14 | 1 | -8/+1 | |
* | | | | | | | | | | | | | | | | Merge branch 'nd/gc-auto-background-fix' into maint | Junio C Hamano | 2015-11-03 | 1 | -1/+55 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | gc: save log from daemonized gc --auto and print it next timend/gc-auto-background-fix | Nguyễn Thái Ngọc Duy | 2015-09-21 | 1 | -1/+55 | |
* | | | | | | | | | | | | | | | | | Merge branch 'ls/p4-translation-failure' into maint | Junio C Hamano | 2015-11-03 | 2 | -11/+66 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |