summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i'Junio C Hamano2014-06-061-0/+3
|\ \ \ \ \ \ \
| * | | | | | | git grep -O -i: if the pager is 'less', pass the '-I' optionsk/spawn-less-case-insensitively-from-grep-O-iJohannes Schindelin2014-05-151-0/+3
| |/ / / / / /
* | | | | | | Merge branch 'jd/subtree'Junio C Hamano2014-06-062-16/+25
|\ \ \ \ \ \ \
| * | | | | | | contrib/subtree: allow adding an annotated tagjd/subtreeJames Denholm2014-05-131-1/+2
| * | | | | | | contrib/subtree/Makefile: clean up rule for "clean"James Denholm2014-05-061-3/+4
| * | | | | | | contrib/subtree/Makefile: clean up rules to generate documentationJames Denholm2014-05-061-5/+8
| * | | | | | | contrib/subtree/Makefile: s/libexecdir/gitexecdir/James Denholm2014-05-061-3/+3
| * | | | | | | contrib/subtree/Makefile: use GIT-VERSION-FILEJames Denholm2014-05-061-3/+8
| * | | | | | | contrib/subtree/Makefile: scrap unused $(gitdir)James Denholm2014-05-061-1/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'wk/doc-clarify-upstream'Junio C Hamano2014-06-061-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Documentation: mention config sources for @{upstream}wk/doc-clarify-upstreamW. Trevor King2014-05-131-1/+3
* | | | | | | | Merge branch 'tb/unicode-6.3-zero-width'Junio C Hamano2014-06-065-69/+334
|\ \ \ \ \ \ \ \
| * | | | | | | | utf8: make it easier to auto-update git_wcwidth()tb/unicode-6.3-zero-widthTorsten Bögershausen2014-05-125-59/+329
| * | | | | | | | utf8.c: use a table for double_widthTorsten Bögershausen2014-05-121-23/+18
* | | | | | | | | Merge branch 'jk/index-pack-report-missing'Junio C Hamano2014-06-061-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | index-pack: distinguish missing objects from type errorsjk/index-pack-report-missingJeff King2014-05-121-2/+7
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bc/blame-crlf-test'Junio C Hamano2014-06-062-1/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | blame: correctly handle files regardless of autocrlfbc/blame-crlf-testbrian m. carlson2014-05-082-1/+9
* | | | | | | | | | Merge branch 'sk/submodules-absolute-path-on-windows'Junio C Hamano2014-06-061-3/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "submodules: fix ambiguous absolute paths under Windows"sk/submodules-absolute-path-on-windowsStepan Kasal2014-05-081-3/+0
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dk/blame-reorg'Junio C Hamano2014-06-061-298/+567
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | blame: large-scale performance rewritedk/blame-reorgDavid Kastrup2014-04-281-298/+567
* | | | | | | | | | | Merge branch 'wg/svn-fe-style-fixes'Junio C Hamano2014-06-061-41/+52
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | svn-fe: conform to pep8wg/svn-fe-style-fixesWilliam Giokas2014-05-121-41/+52
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jn/contrib-remove-vim'Junio C Hamano2014-06-061-22/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | contrib: remove vim support instructionsjn/contrib-remove-vimJonathan Nieder2014-05-091-22/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jn/contrib-remove-diffall'Junio C Hamano2014-06-062-288/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | contrib: remove git-diffalljn/contrib-remove-diffallJonathan Nieder2014-05-092-288/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'dt/merge-recursive-case-insensitive'Junio C Hamano2014-06-063-1/+61
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | mv: allow renaming to fix case on case insensitive filesystemsdt/merge-recursive-case-insensitiveDavid Turner2014-05-082-2/+3
| * | | | | | | | | | | merge-recursive.c: fix case-changing merge bugDavid Turner2014-05-072-0/+59
* | | | | | | | | | | | Merge branch 'rs/reflog-exists'Junio C Hamano2014-06-065-13/+32
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | checkout.c: use ref_exists instead of file_existrs/reflog-existsRonnie Sahlberg2014-05-082-4/+9
| * | | | | | | | | | | | refs.c: add new functions reflog_exists and delete_reflogRonnie Sahlberg2014-05-084-11/+25
* | | | | | | | | | | | | Merge branch 'tg/tag-state-tag-name-in-editor-hints'Junio C Hamano2014-06-061-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | builtin/tag.c: show tag name to hint in the message editortg/tag-state-tag-name-in-editor-hintsThorsten Glaser2014-05-071-4/+4
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/grep-tell-run-command-to-cd-when-running-pager'Junio C Hamano2014-06-061-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | grep: use run-command's "dir" option for --open-files-in-pagerjk/grep-tell-run-command-to-cd-when-running-pagerJeff King2014-05-071-3/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'fc/status-printf-squelch-format-zero-length-warnings'Junio C Hamano2014-06-062-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | silence a bunch of format-zero-length warningsfc/status-printf-squelch-format-zero-length-warningsFelipe Contreras2014-05-072-12/+12
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/squelch-compiler-warning-from-funny-error-macro'Junio C Hamano2014-06-063-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | let clang use the constant-return error() macrojk/squelch-compiler-warning-from-funny-error-macroJeff King2014-05-063-3/+3
| * | | | | | | | | | | | | inline constant return from error() functionJeff King2014-05-063-3/+7
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'dk/raise-core-deltabasecachelimit'Junio C Hamano2014-06-062-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Bump core.deltaBaseCacheLimit to 96mdk/raise-core-deltabasecachelimitDavid Kastrup2014-05-062-2/+2
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'tl/relax-in-poll-emulation'Junio C Hamano2014-06-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | compat/poll: sleep 1 millisecond to avoid busy waittl/relax-in-poll-emulationTheodore Leblond2014-04-291-1/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/utf8-switch-between-nfd-and-nfc'Junio C Hamano2014-06-061-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t3910: show failure of core.precomposeunicode with decomposed filenamesjk/utf8-switch-between-nfd-and-nfcJeff King2014-04-291-0/+10
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'da/imap-send-use-credential-helper'Junio C Hamano2014-06-061-19/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \