summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rebase-interactive: drop early check for valid identjk/rebase-i-drop-ident-checkJeff King2016-07-292-3/+47
* Sync with maintJunio C Hamano2016-07-281-0/+58
|\
| * Some fixes for 2.9.3fbsd-lazy-mtimeJunio C Hamano2016-07-282-1/+59
| * Merge branch 'ak/lazy-prereq-mktemp' into maintJunio C Hamano2016-07-281-1/+6
| |\
| * \ Merge branch 'nd/icase' into maintJunio C Hamano2016-07-2811-21/+291
| |\ \
| * \ \ Merge branch 'sb/submodule-parallel-fetch' into maintJunio C Hamano2016-07-281-16/+27
| |\ \ \
| * \ \ \ Merge branch 'dk/blame-move-no-reason-for-1-line-context' into maintJunio C Hamano2016-07-281-4/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/test-match-signal' into maintJunio C Hamano2016-07-283-11/+26
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maintJunio C Hamano2016-07-281-8/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/t3404-grammo-fix' into maintJunio C Hamano2016-07-281-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nd/doc-new-command' into maintJunio C Hamano2016-07-281-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ew/gc-auto-pack-limit-fix' into maintJunio C Hamano2016-07-281-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/color-on-windows-comment' into maintJunio C Hamano2016-07-281-5/+0
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/doc-tt' into maintJunio C Hamano2016-07-2862-227/+228
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/sign-empty-commit-fix' into maintJunio C Hamano2016-07-281-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/rebase-i-auto-unstash-upon-abort' into maintJunio C Hamano2016-07-282-0/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-07-282-3/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintJunio C Hamano2016-07-287-15/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dg/subtree-rebase-test' into maintJunio C Hamano2016-07-281-0/+119
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | Eighth batch of topics for 2.10Junio C Hamano2016-07-281-19/+34
* | | | | | | | | | | | | | | | | | t9100: portability fixJunio C Hamano2016-07-281-2/+4
* | | | | | | | | | | | | | | | | | Merge branch 'master' of git://git.bogomips.org/git-svnJunio C Hamano2016-07-283-2/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | git-svn: allow --version to work anywhereEric Wong2016-07-222-2/+21
| * | | | | | | | | | | | | | | | | | git-svn: document svn.authorsProg in configEric Wong2016-07-191-0/+3
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-deinit-all'Junio C Hamano2016-07-281-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | submodule deinit: remove outdated commentsb/submodule-deinit-allStefan Beller2016-07-261-2/+0
* | | | | | | | | | | | | | | | | | | | Merge branch 'ew/find-perl-on-freebsd-in-local'Junio C Hamano2016-07-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | config.mak.uname: correct perl path on FreeBSDew/find-perl-on-freebsd-in-localNguyễn Thái Ngọc Duy2016-07-261-0/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/daemon-socket-keepalive'Junio C Hamano2016-07-282-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Windows: add missing definition of ENOTSOCKew/daemon-socket-keepaliveJohannes Sixt2016-07-221-0/+3
| * | | | | | | | | | | | | | | | | | | | | daemon: ignore ENOTSOCK from setsockoptEric Wong2016-07-181-3/+5
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/pack-ofs-4gb-limit'Junio C Hamano2016-07-289-29/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | fsck: use streaming interface for large blobs in packnd/pack-ofs-4gb-limitNguyễn Thái Ngọc Duy2016-07-134-6/+29
| * | | | | | | | | | | | | | | | | | | | | | pack-objects: do not truncate result in-pack object size on 32-bit systemsNguyễn Thái Ngọc Duy2016-07-131-7/+8
| * | | | | | | | | | | | | | | | | | | | | | index-pack: correct "offset" type in unpack_entry_data()Nguyễn Thái Ngọc Duy2016-07-131-1/+1
| * | | | | | | | | | | | | | | | | | | | | | index-pack: report correct bad object offsets even if they are largeNguyễn Thái Ngọc Duy2016-07-131-3/+4
| * | | | | | | | | | | | | | | | | | | | | | index-pack: correct "len" type in unpack_data()Nguyễn Thái Ngọc Duy2016-07-131-7/+7
| * | | | | | | | | | | | | | | | | | | | | | sha1_file.c: use type off_t* for object_info->disk_sizepNguyễn Thái Ngọc Duy2016-07-132-3/+3
| * | | | | | | | | | | | | | | | | | | | | | pack-objects: pass length to check_pack_crc() without truncationNguyễn Thái Ngọc Duy2016-07-122-2/+2
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/worktree-lock'Junio C Hamano2016-07-286-7/+260
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | worktree.c: find_worktree() search by path suffixNguyễn Thái Ngọc Duy2016-07-082-0/+34
| * | | | | | | | | | | | | | | | | | | | | | worktree: add "unlock" commandNguyễn Thái Ngọc Duy2016-07-084-1/+48
| * | | | | | | | | | | | | | | | | | | | | | worktree: add "lock" commandNguyễn Thái Ngọc Duy2016-07-084-7/+110
| * | | | | | | | | | | | | | | | | | | | | | worktree.c: add is_worktree_locked()Nguyễn Thái Ngọc Duy2016-06-132-0/+36
| * | | | | | | | | | | | | | | | | | | | | | worktree.c: add is_main_worktree()Nguyễn Thái Ngọc Duy2016-06-032-0/+10
| * | | | | | | | | | | | | | | | | | | | | | worktree.c: add find_worktree()Nguyễn Thái Ngọc Duy2016-06-032-0/+23
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/notes-merge-no-toctou'Junio C Hamano2016-07-281-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | notes-merge: use O_EXCL to avoid overwriting existing filesrs/notes-merge-no-toctouRené Scharfe2016-07-071-5/+1
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/rebase-i-tests'Junio C Hamano2016-07-282-0/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | rebase -i: we allow extra spaces after fixup!/squash!js/rebase-i-testsJohannes Schindelin2016-07-071-0/+9