summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | log: handle integer overflow in timestampsJeff King2014-02-242-2/+24
| * | | | | date: check date overflow against time_tJeff King2014-02-243-1/+19
| * | | | | fsck: report integer overflow in author timestampsJeff King2014-02-242-6/+20
| * | | | | t4212: test bogus timestamps with git-logJeff King2014-02-241-0/+21
* | | | | | Merge branch 'jh/note-trees-record-blobs'Junio C Hamano2014-03-142-1/+32
|\ \ \ \ \ \
| * | | | | | notes: disallow reusing non-blob as a note objectjh/note-trees-record-blobsJohan Herland2014-02-202-1/+32
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'rt/links-for-asciidoctor'Junio C Hamano2014-03-146-9/+9
|\ \ \ \ \ \
| * | | | | | Documentation: fix documentation AsciiDoc links for external urlsrt/links-for-asciidoctorRoberto Tyley2014-02-206-9/+9
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'nd/no-more-fnmatch'Junio C Hamano2014-03-1422-759/+20
|\ \ \ \ \ \
| * | | | | | actually remove compat fnmatch source codend/no-more-fnmatchNguyễn Thái Ngọc Duy2014-02-202-578/+0
| * | | | | | stop using fnmatch (either native or compat)Nguyễn Thái Ngọc Duy2014-02-206-91/+0
| * | | | | | Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch"Nguyễn Thái Ngọc Duy2014-02-201-73/+0
| * | | | | | use wildmatch() directly without fnmatch() wrapperNguyễn Thái Ngọc Duy2014-02-2014-17/+20
| |/ / / / /
* | | | | | Merge branch 'ak/gitweb-fit-image'Junio C Hamano2014-03-142-1/+6
|\ \ \ \ \ \
| * | | | | | gitweb: Avoid overflowing page body frame with large imagesak/gitweb-fit-imageAndrew Keller2014-02-202-1/+6
| |/ / / / /
* | | | | | Merge branch 'tr/diff-submodule-no-reuse-worktree'Junio C Hamano2014-03-142-3/+32
|\ \ \ \ \ \
| * | | | | | diff: do not reuse_worktree_file for submodulestr/diff-submodule-no-reuse-worktreeThomas Rast2014-02-182-3/+32
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'nd/reset-setup-worktree'Junio C Hamano2014-03-142-3/+15
|\ \ \ \ \ \
| * | | | | | reset: optionally setup worktree and refresh index on --mixednd/reset-setup-worktreeNguyễn Thái Ngọc Duy2014-02-182-3/+15
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'lb/contrib-contacts-looser-diff-parsing'Junio C Hamano2014-03-141-2/+0
|\ \ \ \ \ \
| * | | | | | git-contacts: do not fail parsing of good diffslb/contrib-contacts-looser-diff-parsingLars Gullik Bjønnes2014-02-181-2/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ks/config-file-stdin'Junio C Hamano2014-03-145-77/+145
|\ \ \ \ \ \
| * | | | | | config: teach "git config --file -" to read from the standard inputks/config-file-stdinKirill A. Shutemov2014-02-185-17/+69
| * | | | | | config: change git_config_with_options() interfaceKirill A. Shutemov2014-02-183-49/+47
| * | | | | | builtin/config.c: rename check_blob_write() -> check_write()Kirill A. Shutemov2014-02-181-9/+9
| * | | | | | config: disallow relative include paths from blobsJeff King2014-02-182-4/+22
| |/ / / / /
* | | | | | Merge branch 'jk/janitorial-fixes'Junio C Hamano2014-03-144-6/+9
|\ \ \ \ \ \
| * | | | | | open_istream(): do not dereference NULL in the error casejk/janitorial-fixesJunio C Hamano2014-02-181-1/+3
| * | | | | | builtin/mv: don't use memory after freeJohn Keeping2014-02-181-1/+2
| * | | | | | utf8: use correct type for values in interval tableJohn Keeping2014-02-181-2/+2
| * | | | | | utf8: fix iconv error detectionJohn Keeping2014-02-181-1/+1
| * | | | | | notes-utils: handle boolean notes.rewritemode correctlyJohn Keeping2014-02-181-1/+1
| |/ / / / /
* | | | | | Merge branch 'jk/http-no-curl-easy'Junio C Hamano2014-03-143-13/+25
|\ \ \ \ \ \
| * | | | | | http: never use curl_easy_performjk/http-no-curl-easyJeff King2014-02-183-13/+25
| |/ / / / /
* | | | | | Merge branch 'ss/completion-rec-sub-fetch-push'Junio C Hamano2014-03-141-1/+18
|\ \ \ \ \ \
| * | | | | | completion: teach --recurse-submodules to fetch, pull and pushss/completion-rec-sub-fetch-pushSup Yut Sum2014-02-111-1/+18
* | | | | | | Merge branch 'nd/gitignore-trailing-whitespace'Junio C Hamano2014-03-143-0/+54
|\ \ \ \ \ \ \
| * | | | | | | t0008: skip trailing space test on WindowsJohannes Sixt2014-03-111-1/+1
| * | | | | | | dir: ignore trailing spaces in exclude patternsNguyễn Thái Ngọc Duy2014-02-103-13/+19
| * | | | | | | dir: warn about trailing spaces in exclude patternsNguyễn Thái Ngọc Duy2014-02-102-0/+48
* | | | | | | | Merge branch 'jc/check-attr-honor-working-tree'Junio C Hamano2014-03-142-22/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | check-attr: move to the top of working tree when in non-bare repositoryjc/check-attr-honor-working-treeJunio C Hamano2014-02-062-0/+13
| * | | | | | | | t0003: do not chdir the whole test processJunio C Hamano2014-02-061-22/+30
* | | | | | | | | Start preparing for Git 2.0Junio C Hamano2014-03-072-1/+147
* | | | | | | | | Merge branch 'cc/starts-n-ends-with-endgame'Junio C Hamano2014-03-073-21/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | strbuf: remove prefixcmp() and suffixcmp()cc/starts-n-ends-with-endgameChristian Couder2013-12-052-20/+0
* | | | | | | | | | Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Junio C Hamano2014-03-074-21/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: remove "diff-files -q" in a version of Git in a distant futurejc/hold-diff-remove-q-synonym-for-no-deletionJunio C Hamano2013-07-194-21/+0
* | | | | | | | | | | Merge branch 'gj/push-more-verbose-advice'Junio C Hamano2014-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | push: switch default from "matching" to "simple"gj/push-more-verbose-adviceJunio C Hamano2013-11-135-42/+18