summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/diagnose-config-mmap-failure' into maintJunio C Hamano2015-06-254-11/+29
|\
| * xmmap(): drop "Out of memory?"jk/diagnose-config-mmap-failureJunio C Hamano2015-05-281-1/+1
| * config.c: rewrite ENODEV into EISDIR when mmap failsJeff King2015-05-281-0/+2
| * config.c: avoid xmmap error messagesJeff King2015-05-283-6/+21
| * config.c: fix mmap leak when writing configJeff King2015-05-281-4/+5
| * read-cache.c: drop PROT_WRITE from mmap of indexJeff King2015-05-281-1/+1
* | Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maintJunio C Hamano2015-06-257-9/+34
|\ \
| * | suppress errors on missing UNINTERESTING linksjk/squelch-missing-link-warning-for-unreachableJeff King2015-06-011-1/+1
| * | silence broken link warnings with revs->ignore_missing_linksJeff King2015-06-013-2/+17
| * | add quieter versions of parse_{tree,commit}Jeff King2015-06-014-6/+16
| |/
* | Merge branch 'mm/rebase-i-post-rewrite-exec' into maintJunio C Hamano2015-06-252-41/+58
|\ \
| * | t5407: use <<- to align the expected outputmm/rebase-i-post-rewrite-execJunio C Hamano2015-05-221-40/+40
| * | rebase -i: fix post-rewrite hook with failed exec commandMatthieu Moy2015-05-222-6/+6
| * | rebase -i: demonstrate incorrect behavior of post-rewriteMatthieu Moy2015-05-221-0/+17
* | | Git 2.4.4v2.4.4Junio C Hamano2015-06-164-3/+39
* | | Merge branch 'jk/clone-dissociate' into maintJunio C Hamano2015-06-161-13/+4
|\ \ \
| * | | clone: reorder --dissociate and --reference optionsjk/clone-dissociateJeff King2015-05-271-2/+2
| * | | clone: use OPT_STRING_LIST for --referenceJeff King2015-05-271-11/+2
* | | | Merge branch 'sb/submodule-doc-intro' into maintJunio C Hamano2015-06-161-28/+22
|\ \ \ \
| * | | | submodule doc: reorder introductory paragraphssb/submodule-doc-introStefan Beller2015-05-281-28/+22
* | | | | Merge branch 'sb/glossary-submodule' into maintJunio C Hamano2015-06-161-0/+16
|\ \ \ \ \
| * | | | | glossary: add "remote", "submodule", "superproject"sb/glossary-submoduleStefan Beller2015-05-291-0/+16
| |/ / / /
* | | | | Merge branch 'ah/usage-strings' into maintJunio C Hamano2015-06-162-2/+2
|\ \ \ \ \
| * | | | | blame, log: format usage strings similarly to those in documentationah/usage-stringsAlex Henrie2015-05-032-2/+2
* | | | | | Merge branch 'mc/commit-doc-grammofix' into maintJunio C Hamano2015-06-161-1/+1
|\ \ \ \ \ \
| * | | | | | Documentation/git-commit: grammofixmc/commit-doc-grammofixMichael Coleman2015-05-191-1/+1
* | | | | | | Merge branch 'rs/janitorial' into maintJunio C Hamano2015-06-167-26/+9
|\ \ \ \ \ \ \
| * | | | | | | dir: remove unused variable sbrs/janitorialRené Scharfe2015-05-201-2/+0
| * | | | | | | clean: remove unused variable bufRené Scharfe2015-05-201-2/+0
| * | | | | | | use file_exists() to check if a file exists in the worktreeRené Scharfe2015-05-205-22/+9
* | | | | | | | Merge branch 'sb/test-bitmap-free-at-end' into maintJunio C Hamano2015-06-161-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | test_bitmap_walk: free bitmap with bitmap_freesb/test-bitmap-free-at-endJeff King2015-05-221-1/+1
* | | | | | | | | Merge branch 'dt/clean-pathspec-filter-then-lstat' into maintJunio C Hamano2015-06-161-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clean: only lstat files in pathspecdt/clean-pathspec-filter-then-lstatDavid Turner2015-05-181-3/+3
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/http-backend-deadlock' into maintJunio C Hamano2015-06-163-29/+139
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlockjk/http-backend-deadlockJunio C Hamano2015-05-253-29/+139
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3jk/http-backend-deadlock-2.3Junio C Hamano2015-05-253-29/+139
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | http-backend: spool ref negotiation requests to bufferjk/http-backend-deadlock-2.2Jeff King2015-05-253-11/+105
| | | * | | | | | | | t5551: factor out tag creationJeff King2015-05-201-13/+21
| | | * | | | | | | | http-backend: fix die recursion with custom handlerJeff King2015-05-151-5/+9
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
* | | | | | | | | | Merge branch 'jh/filter-empty-contents' into maintJunio C Hamano2015-06-162-1/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | sha1_file: pass empty buffer to index empty filejh/filter-empty-contentsJim Hill2015-05-182-1/+27
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/stash-options' into maintJunio C Hamano2015-06-162-1/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | stash: recognize "--help" for subcommandsjk/stash-optionsJeff King2015-05-201-0/+11
| * | | | | | | | | | stash: complain about unknown flagsJeff King2015-05-202-1/+9
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mm/log-format-raw-doc' into maintJunio C Hamano2015-06-162-2/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/log: clarify sha1 non-abbreviation in log --rawmm/log-format-raw-docMatthieu Moy2015-05-201-1/+4
| * | | | | | | | | | Documentation/log: clarify what --raw meansMatthieu Moy2015-05-181-1/+10
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ep/do-not-feed-a-pointer-to-array-size' into maintJunio C Hamano2015-06-161-1/+53
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deri...ep/do-not-feed-a-pointer-to-array-sizeElia Pinto2015-05-051-1/+53
| | |/ / / / / / / / | |/| | | | | | | |
View Lorry Controller Status