Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | index-pack: distinguish missing objects from type errorsjk/index-pack-report-missing | Jeff King | 2014-05-12 | 1 | -2/+7 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'bc/blame-crlf-test' | Junio C Hamano | 2014-06-06 | 2 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | blame: correctly handle files regardless of autocrlfbc/blame-crlf-test | brian m. carlson | 2014-05-08 | 2 | -1/+9 | |
* | | | | | | | | | | Merge branch 'sk/submodules-absolute-path-on-windows' | Junio C Hamano | 2014-06-06 | 1 | -3/+0 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Revert "submodules: fix ambiguous absolute paths under Windows"sk/submodules-absolute-path-on-windows | Stepan Kasal | 2014-05-08 | 1 | -3/+0 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'dk/blame-reorg' | Junio C Hamano | 2014-06-06 | 1 | -298/+567 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | blame: large-scale performance rewritedk/blame-reorg | David Kastrup | 2014-04-28 | 1 | -298/+567 | |
* | | | | | | | | | | | Merge branch 'wg/svn-fe-style-fixes' | Junio C Hamano | 2014-06-06 | 1 | -41/+52 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | svn-fe: conform to pep8wg/svn-fe-style-fixes | William Giokas | 2014-05-12 | 1 | -41/+52 | |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'jn/contrib-remove-vim' | Junio C Hamano | 2014-06-06 | 1 | -22/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | contrib: remove vim support instructionsjn/contrib-remove-vim | Jonathan Nieder | 2014-05-09 | 1 | -22/+0 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'jn/contrib-remove-diffall' | Junio C Hamano | 2014-06-06 | 2 | -288/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | contrib: remove git-diffalljn/contrib-remove-diffall | Jonathan Nieder | 2014-05-09 | 2 | -288/+0 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'dt/merge-recursive-case-insensitive' | Junio C Hamano | 2014-06-06 | 3 | -1/+61 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | mv: allow renaming to fix case on case insensitive filesystemsdt/merge-recursive-case-insensitive | David Turner | 2014-05-08 | 2 | -2/+3 | |
| * | | | | | | | | | | | merge-recursive.c: fix case-changing merge bug | David Turner | 2014-05-07 | 2 | -0/+59 | |
* | | | | | | | | | | | | Merge branch 'rs/reflog-exists' | Junio C Hamano | 2014-06-06 | 5 | -13/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | checkout.c: use ref_exists instead of file_existrs/reflog-exists | Ronnie Sahlberg | 2014-05-08 | 2 | -4/+9 | |
| * | | | | | | | | | | | | refs.c: add new functions reflog_exists and delete_reflog | Ronnie Sahlberg | 2014-05-08 | 4 | -11/+25 | |
* | | | | | | | | | | | | | Merge branch 'tg/tag-state-tag-name-in-editor-hints' | Junio C Hamano | 2014-06-06 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | builtin/tag.c: show tag name to hint in the message editortg/tag-state-tag-name-in-editor-hints | Thorsten Glaser | 2014-05-07 | 1 | -4/+4 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/grep-tell-run-command-to-cd-when-running-pager' | Junio C Hamano | 2014-06-06 | 1 | -3/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | grep: use run-command's "dir" option for --open-files-in-pagerjk/grep-tell-run-command-to-cd-when-running-pager | Jeff King | 2014-05-07 | 1 | -3/+1 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'fc/status-printf-squelch-format-zero-length-warnings' | Junio C Hamano | 2014-06-06 | 2 | -12/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | silence a bunch of format-zero-length warningsfc/status-printf-squelch-format-zero-length-warnings | Felipe Contreras | 2014-05-07 | 2 | -12/+12 | |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/squelch-compiler-warning-from-funny-error-macro' | Junio C Hamano | 2014-06-06 | 3 | -6/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | let clang use the constant-return error() macrojk/squelch-compiler-warning-from-funny-error-macro | Jeff King | 2014-05-06 | 3 | -3/+3 | |
| * | | | | | | | | | | | | | inline constant return from error() function | Jeff King | 2014-05-06 | 3 | -3/+7 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'dk/raise-core-deltabasecachelimit' | Junio C Hamano | 2014-06-06 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Bump core.deltaBaseCacheLimit to 96mdk/raise-core-deltabasecachelimit | David Kastrup | 2014-05-06 | 2 | -2/+2 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'tl/relax-in-poll-emulation' | Junio C Hamano | 2014-06-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | compat/poll: sleep 1 millisecond to avoid busy waittl/relax-in-poll-emulation | Theodore Leblond | 2014-04-29 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/utf8-switch-between-nfd-and-nfc' | Junio C Hamano | 2014-06-06 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | t3910: show failure of core.precomposeunicode with decomposed filenamesjk/utf8-switch-between-nfd-and-nfc | Jeff King | 2014-04-29 | 1 | -0/+10 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'da/imap-send-use-credential-helper' | Junio C Hamano | 2014-06-06 | 1 | -19/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | imap-send: use git-credentialda/imap-send-use-credential-helper | Dan Albert | 2014-04-29 | 1 | -19/+26 | |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'je/pager-do-not-recurse' | Junio C Hamano | 2014-06-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | pager: do allow spawning pager recursivelyjn/pager-do-not-recurseje/pager-do-not-recurse | Jörn Engel | 2014-04-28 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/commit-C-pick-empty' | Junio C Hamano | 2014-06-06 | 2 | -4/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | commit: do not complain of empty messages from -Cjk/commit-C-pick-empty | Jeff King | 2014-04-28 | 2 | -4/+12 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'mm/pager-less-sans-S' | Junio C Hamano | 2014-06-06 | 4 | -8/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | pager: remove 'S' from $LESS by defaultmm/pager-less-sans-S | Matthieu Moy | 2014-05-07 | 4 | -8/+13 | |
* | | | | | | | | | | | | | | First batch for 2.1tb/sed-bs-n-not-portable | Junio C Hamano | 2014-06-03 | 3 | -2/+88 | |
* | | | | | | | | | | | | | | Merge branch 'sk/msvc-dynlink-crt' | Junio C Hamano | 2014-06-03 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | MSVC: link dynamically to the CRTsk/msvc-dynlink-crt | Karsten Blees | 2014-05-06 | 1 | -3/+3 | |
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'ew/config-protect-mode' | Junio C Hamano | 2014-06-03 | 2 | -0/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | config: preserve config file permissions on editsew/config-protect-mode | Eric Wong | 2014-05-06 | 2 | -0/+26 | |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'bg/strbuf-trim' | Junio C Hamano | 2014-06-03 | 2 | -9/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | api-strbuf.txt: add docs for _trim and _ltrimbg/strbuf-trim | Brian Gesiak | 2014-05-06 | 1 | -0/+9 | |
| * | | | | | | | | | | | | | | strbuf: use _rtrim and _ltrim in strbuf_trim | Brian Gesiak | 2014-05-06 | 1 | -9/+2 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |