Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' | Junio C Hamano | 2014-06-06 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | git grep -O -i: if the pager is 'less', pass the '-I' optionsk/spawn-less-case-insensitively-from-grep-O-i | Johannes Schindelin | 2014-05-15 | 1 | -0/+3 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge branch 'jd/subtree' | Junio C Hamano | 2014-06-06 | 2 | -16/+25 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | contrib/subtree: allow adding an annotated tagjd/subtree | James Denholm | 2014-05-13 | 1 | -1/+2 | |
| * | | | | | | | contrib/subtree/Makefile: clean up rule for "clean" | James Denholm | 2014-05-06 | 1 | -3/+4 | |
| * | | | | | | | contrib/subtree/Makefile: clean up rules to generate documentation | James Denholm | 2014-05-06 | 1 | -5/+8 | |
| * | | | | | | | contrib/subtree/Makefile: s/libexecdir/gitexecdir/ | James Denholm | 2014-05-06 | 1 | -3/+3 | |
| * | | | | | | | contrib/subtree/Makefile: use GIT-VERSION-FILE | James Denholm | 2014-05-06 | 1 | -3/+8 | |
| * | | | | | | | contrib/subtree/Makefile: scrap unused $(gitdir) | James Denholm | 2014-05-06 | 1 | -1/+0 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge branch 'wk/doc-clarify-upstream' | Junio C Hamano | 2014-06-06 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Documentation: mention config sources for @{upstream}wk/doc-clarify-upstream | W. Trevor King | 2014-05-13 | 1 | -1/+3 | |
* | | | | | | | | Merge branch 'tb/unicode-6.3-zero-width' | Junio C Hamano | 2014-06-06 | 5 | -69/+334 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | utf8: make it easier to auto-update git_wcwidth()tb/unicode-6.3-zero-width | Torsten Bögershausen | 2014-05-12 | 5 | -59/+329 | |
| * | | | | | | | | utf8.c: use a table for double_width | Torsten Bögershausen | 2014-05-12 | 1 | -23/+18 | |
* | | | | | | | | | Merge branch 'jk/index-pack-report-missing' | Junio C Hamano | 2014-06-06 | 1 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |