Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | | t7060: add test for status --branch on a detached HEAD | René Scharfe | 2015-11-01 | |
* | | | | | | | | | Merge branch 'jk/initialization-fix-to-add-submodule-odb' into maint | Junio C Hamano | 2015-11-05 | |
|\ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | add_submodule_odb: initialize alt_odb list earlier | Jeff King | 2015-10-28 | |
* | | | | | | | | | | Merge branch 'js/misc-fixes' into maint | Junio C Hamano | 2015-11-05 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | Correct fscanf formatting string for I64u values | Waldek Maleska | 2015-10-26 | |
| * | | | | | | | | | | Silence GCC's "cast of pointer to integer of a different size" warning | Johannes Schindelin | 2015-10-26 | |
| * | | | | | | | | | | Squelch warning about an integer overflow | Johannes Schindelin | 2015-10-26 | |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||
* | | | | | | | | | | Merge branch 'jc/add-u-A-default-to-top' into maint | Junio C Hamano | 2015-11-05 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | add: simplify -u/-A without pathspec | Junio C Hamano | 2015-10-24 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||
* | | | | | | | | | | Merge branch 'jk/delete-modechange-conflict' into maint | Junio C Hamano | 2015-11-05 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | merge: detect delete/modechange conflict | Jeff King | 2015-10-26 | |
| * | | | | | | | | | | t6031: generalize for recursive and resolve strategies | Jeff King | 2015-10-26 | |
| * | | | | | | | | | | t6031: move triple-rename test to t3030 | Jeff King | 2015-10-26 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||
* | | | | | | | | | | Merge branch 'js/imap-send-curl-compilation-fix' into maint | Junio C Hamano | 2015-11-05 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually available | Johannes Schindelin | 2015-10-26 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||
* | | | | | | | | | | Merge branch 'rp/link-curl-before-ssl' into maint | Junio C Hamano | 2015-11-05 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | configure.ac: detect ssl need with libcurl | Remi Pommarel | 2015-10-21 | |
| * | | | | | | | | | | Makefile: make curl-config path configurable | Remi Pommarel | 2015-10-21 | |
| * | | | | | | | | | | Makefile: link libcurl before zlib | Remi Pommarel | 2015-10-21 | |
* | | | | | | | | | | | Merge branch 'nd/clone-linked-checkout' into maint | Junio C Hamano | 2015-11-05 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | clone: better error when --reference is a linked checkout | Nguyễn Thái Ngọc Duy | 2015-09-28 | |
| * | | | | | | | | | | | clone: allow --local from a linked checkout | Nguyễn Thái Ngọc Duy | 2015-09-28 | |
| * | | | | | | | | | | | enter_repo: allow .git files in strict mode | Nguyễn Thái Ngọc Duy | 2015-09-28 | |
| * | | | | | | | | | | | enter_repo: avoid duplicating logic, use is_git_directory() instead | Nguyễn Thái Ngọc Duy | 2015-09-28 | |
| * | | | | | | | | | | | t0002: add test for enter_repo(), non-strict mode | Nguyễn Thái Ngọc Duy | 2015-09-28 | |
| * | | | | | | | | | | | path.c: delete an extra space | Nguyễn Thái Ngọc Duy | 2015-09-07 | |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||
* | | | | | | | | | | | Merge branch 'sa/send-email-smtp-batch-data-limit' into maint | Junio C Hamano | 2015-11-05 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | git-send-email.perl: Fixed sending of many/huge changes/patches | Stefan Agner | 2015-09-30 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||
* | | | | | | | | | | | Merge branch 'xf/user-manual-ff' into maint | Junio C Hamano | 2015-11-04 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | user-manual: fix the description of fast-forward | Xue Fuqiao | 2015-10-26 | |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||
* | | | | | | | | | | | Merge branch 'xf/user-manual-markup' into maint | Junio C Hamano | 2015-11-04 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | Documentation: match undefline with the text in old release notes | Junio C Hamano | 2015-10-22 | |
| * | | | | | | | | | | | Documentation: match underline with the text | Junio C Hamano | 2015-10-22 | |
| * | | | | | | | | | | | Documentation: fix header markup | Xue Fuqiao | 2015-10-22 | |
| |/ / / / / / / / / / | ||||
* | | | | | | | | | | | Merge branch 'jc/everyday-markup' into maint | Junio C Hamano | 2015-11-04 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | Documentation/everyday: match undefline with the text | Junio C Hamano | 2015-10-22 | |
* | | | | | | | | | | | | Merge branch 'jc/em-dash-in-doc' into maint | Junio C Hamano | 2015-11-04 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | Documentation: AsciiDoc spells em-dash as double-dashes, not triple | Junio C Hamano | 2015-10-22 | |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||
* | | | | | | | | | | | | Merge branch 'es/worktree-add' into maint | Junio C Hamano | 2015-11-04 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | worktree: usage: denote <branch> as optional with 'add' | Sidhant Sharma | 2015-10-18 | |
* | | | | | | | | | | | | | Merge branch 'mk/blame-error-message' into maint | Junio C Hamano | 2015-11-03 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | blame: fix option name in error message | Max Kirillov | 2015-10-26 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge branch 'jk/merge-file-exit-code' into maint | Junio C Hamano | 2015-11-03 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | merge-file: clamp exit code to maximum 127 | Jeff King | 2015-10-29 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge branch 'dt/name-hash-dir-entry-fix' into maint | Junio C Hamano | 2015-11-03 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | name-hash: don't reuse cache_entry in dir_entry | David Turner | 2015-10-21 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge branch 'jc/am-3-fallback-regression-fix' into maint | Junio C Hamano | 2015-11-03 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | am -3: do not let failed merge from completing the error codepath | Junio C Hamano | 2015-10-09 | |
* | | | | | | | | | | | | | | Merge branch 'jc/usage-stdin' into maint | Junio C Hamano | 2015-11-03 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | usage: do not insist that standard input must come from a file | Junio C Hamano | 2015-10-16 |