summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | Merge branch 'jc/coding-guidelines'Junio C Hamano2014-06-061-5/+145
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | CodingGuidelines: avoid "test <cond> -a/-o <cond>"Junio C Hamano2014-05-201-0/+13
| * | | | | | | | | | | | | | | | CodingGuidelines: on splitting a long lineJunio C Hamano2014-05-021-0/+55
| * | | | | | | | | | | | | | | | CodingGuidelines: on comparisonJunio C Hamano2014-05-021-0/+27
| * | | | | | | | | | | | | | | | CodingGuidelines: do not call the conditional statement "if()"Junio C Hamano2014-05-021-1/+1
| * | | | | | | | | | | | | | | | CodingGuidelines: give an example for shell function preambleJunio C Hamano2014-05-021-3/+11
| * | | | | | | | | | | | | | | | CodingGuidelines: give an example for control statementsJunio C Hamano2014-05-021-0/+11
| * | | | | | | | | | | | | | | | CodingGuidelines: give an example for redirectionJunio C Hamano2014-05-021-0/+8
| * | | | | | | | | | | | | | | | CodingGuidelines: give an example for case/esac statementJunio C Hamano2014-05-021-1/+11
| * | | | | | | | | | | | | | | | CodingGuidelines: once it is in, it is not worth the code churnJunio C Hamano2014-05-021-0/+8
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'nd/status-auto-comment-char'Junio C Hamano2014-06-067-4/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | commit: allow core.commentChar=auto for character auto selectionnd/status-auto-comment-charNguyễn Thái Ngọc Duy2014-05-196-0/+66
| * | | | | | | | | | | | | | | | config: be strict on core.commentCharNguyễn Thái Ngọc Duy2014-05-192-4/+7
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'mt/rebase-i-keep-empty-test'Junio C Hamano2014-06-061-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rebase --keep-empty -i: add testmt/rebase-i-keep-empty-testMichael S. Tsirkin2014-05-191-0/+8
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'mk/show-s-no-extra-blank-line-for-merges'Junio C Hamano2014-06-064-11/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-show: fix 'git show -s' to not add extra terminator after merge commitmk/show-s-no-extra-blank-line-for-mergesMax Kirillov2014-05-154-11/+15
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | 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