Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'bc/blame-crlf-test' | Junio C Hamano | 2014-06-06 |
|\ | |||
| * | blame: correctly handle files regardless of autocrlf | brian m. carlson | 2014-05-08 |
* | | Merge branch 'sk/submodules-absolute-path-on-windows' | Junio C Hamano | 2014-06-06 |
|\ \ | |||
| * | | Revert "submodules: fix ambiguous absolute paths under Windows" | Stepan Kasal | 2014-05-08 |
* | | | Merge branch 'dk/blame-reorg' | Junio C Hamano | 2014-06-06 |
|\ \ \ | |||
| * | | | blame: large-scale performance rewrite | David Kastrup | 2014-04-28 |
* | | | | Merge branch 'wg/svn-fe-style-fixes' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ | |||
| * | | | | svn-fe: conform to pep8 | William Giokas | 2014-05-12 |
* | | | | | Merge branch 'jn/contrib-remove-vim' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ | |||
| * | | | | | contrib: remove vim support instructions | Jonathan Nieder | 2014-05-09 |
| |/ / / / | |||
* | | | | | Merge branch 'jn/contrib-remove-diffall' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ | |||
| * | | | | | contrib: remove git-diffall | Jonathan Nieder | 2014-05-09 |
| |/ / / / | |||
* | | | | | Merge branch 'dt/merge-recursive-case-insensitive' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ | |||
| * | | | | | mv: allow renaming to fix case on case insensitive filesystems | David Turner | 2014-05-08 |
| * | | | | | merge-recursive.c: fix case-changing merge bug | David Turner | 2014-05-07 |
* | | | | | | Merge branch 'rs/reflog-exists' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ | |||
| * | | | | | | checkout.c: use ref_exists instead of file_exist | Ronnie Sahlberg | 2014-05-08 |
| * | | | | | | refs.c: add new functions reflog_exists and delete_reflog | Ronnie Sahlberg | 2014-05-08 |
* | | | | | | | Merge branch 'tg/tag-state-tag-name-in-editor-hints' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | builtin/tag.c: show tag name to hint in the message editor | Thorsten Glaser | 2014-05-07 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'jk/grep-tell-run-command-to-cd-when-running-pager' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | grep: use run-command's "dir" option for --open-files-in-pager | Jeff King | 2014-05-07 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'fc/status-printf-squelch-format-zero-length-warnings' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | silence a bunch of format-zero-length warnings | Felipe Contreras | 2014-05-07 |
| | |_|_|_|/ / | |/| | | | | | |||
* | | | | | | | Merge branch 'jk/squelch-compiler-warning-from-funny-error-macro' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | let clang use the constant-return error() macro | Jeff King | 2014-05-06 |
| * | | | | | | | inline constant return from error() function | Jeff King | 2014-05-06 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'dk/raise-core-deltabasecachelimit' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Bump core.deltaBaseCacheLimit to 96m | David Kastrup | 2014-05-06 |
| | |_|_|/ / / | |/| | | | | | |||
* | | | | | | | Merge branch 'tl/relax-in-poll-emulation' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | compat/poll: sleep 1 millisecond to avoid busy wait | Theodore Leblond | 2014-04-29 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'jk/utf8-switch-between-nfd-and-nfc' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t3910: show failure of core.precomposeunicode with decomposed filenames | Jeff King | 2014-04-29 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'da/imap-send-use-credential-helper' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | imap-send: use git-credential | Dan Albert | 2014-04-29 |
| | |_|_|_|/ / | |/| | | | | | |||
* | | | | | | | Merge branch 'je/pager-do-not-recurse' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | pager: do allow spawning pager recursively | Jörn Engel | 2014-04-28 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'jk/commit-C-pick-empty' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | commit: do not complain of empty messages from -C | Jeff King | 2014-04-28 |
| | |_|_|/ / / | |/| | | | | | |||
* | | | | | | | Merge branch 'mm/pager-less-sans-S' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | pager: remove 'S' from $LESS by default | Matthieu Moy | 2014-05-07 |
* | | | | | | | | First batch for 2.1 | Junio C Hamano | 2014-06-03 |
* | | | | | | | | Merge branch 'sk/msvc-dynlink-crt' | Junio C Hamano | 2014-06-03 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | MSVC: link dynamically to the CRT | Karsten Blees | 2014-05-06 |
* | | | | | | | | | Merge branch 'ew/config-protect-mode' | Junio C Hamano | 2014-06-03 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | config: preserve config file permissions on edits | Eric Wong | 2014-05-06 |
| | |_|_|/ / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'bg/strbuf-trim' | Junio C Hamano | 2014-06-03 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | api-strbuf.txt: add docs for _trim and _ltrim | Brian Gesiak | 2014-05-06 |
| * | | | | | | | | | strbuf: use _rtrim and _ltrim in strbuf_trim | Brian Gesiak | 2014-05-06 |
| | |_|/ / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jk/commit-date-approxidate' | Junio C Hamano | 2014-06-03 |
|\ \ \ \ \ \ \ \ \ |