aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* builtin/apply: move init_apply_state() to apply.cChristian Couder2016-08-11
* builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die(...Christian Couder2016-08-11
* builtin/apply: make parse_whitespace_option() return -1 instead of die()ingChristian Couder2016-08-11
* builtin/apply: make parse_single_patch() return -1 on errorChristian Couder2016-08-11
* builtin/apply: make parse_chunk() return a negative integer on errorChristian Couder2016-08-11
* builtin/apply: make find_header() return -128 instead of die()ingChristian Couder2016-08-11
* builtin/apply: read_patch_file() return -1 instead of die()ingChristian Couder2016-08-11
* builtin/apply: make apply_patch() return -1 or -128 instead of die()ingChristian Couder2016-08-11
* apply: move 'struct apply_state' to apply.hChristian Couder2016-08-11
* apply: make some names more specificChristian Couder2016-08-11
* Sync with maintJunio C Hamano2016-07-28
|\
| * Some fixes for 2.9.3Junio C Hamano2016-07-28
| * Merge branch 'ak/lazy-prereq-mktemp' into maintJunio C Hamano2016-07-28
| |\
| * \ Merge branch 'nd/icase' into maintJunio C Hamano2016-07-28
| |\ \
| * \ \ Merge branch 'sb/submodule-parallel-fetch' into maintJunio C Hamano2016-07-28
| |\ \ \
| * \ \ \ Merge branch 'dk/blame-move-no-reason-for-1-line-context' into maintJunio C Hamano2016-07-28
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/test-match-signal' into maintJunio C Hamano2016-07-28
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maintJunio C Hamano2016-07-28
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/t3404-grammo-fix' into maintJunio C Hamano2016-07-28
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nd/doc-new-command' into maintJunio C Hamano2016-07-28
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ew/gc-auto-pack-limit-fix' into maintJunio C Hamano2016-07-28
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/color-on-windows-comment' into maintJunio C Hamano2016-07-28
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/doc-tt' into maintJunio C Hamano2016-07-28
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/sign-empty-commit-fix' into maintJunio C Hamano2016-07-28
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/rebase-i-auto-unstash-upon-abort' into maintJunio C Hamano2016-07-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-07-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintJunio C Hamano2016-07-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dg/subtree-rebase-test' into maintJunio C Hamano2016-07-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | Eighth batch of topics for 2.10Junio C Hamano2016-07-28
* | | | | | | | | | | | | | | | | | t9100: portability fixJunio C Hamano2016-07-28
* | | | | | | | | | | | | | | | | | Merge branch 'master' of git://git.bogomips.org/git-svnJunio C Hamano2016-07-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | git-svn: allow --version to work anywhereEric Wong2016-07-22
| * | | | | | | | | | | | | | | | | | git-svn: document svn.authorsProg in configEric Wong2016-07-19
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-deinit-all'Junio C Hamano2016-07-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | submodule deinit: remove outdated commentStefan Beller2016-07-26
* | | | | | | | | | | | | | | | | | | | Merge branch 'ew/find-perl-on-freebsd-in-local'Junio C Hamano2016-07-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | config.mak.uname: correct perl path on FreeBSDNguyễn Thái Ngọc Duy2016-07-26
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/daemon-socket-keepalive'Junio C Hamano2016-07-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Windows: add missing definition of ENOTSOCKJohannes Sixt2016-07-22
| * | | | | | | | | | | | | | | | | | | | | daemon: ignore ENOTSOCK from setsockoptEric Wong2016-07-18
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/pack-ofs-4gb-limit'Junio C Hamano2016-07-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | fsck: use streaming interface for large blobs in packNguyễn Thái Ngọc Duy2016-07-13
| * | | | | | | | | | | | | | | | | | | | | | pack-objects: do not truncate result in-pack object size on 32-bit systemsNguyễn Thái Ngọc Duy2016-07-13
| * | | | | | | | | | | | | | | | | | | | | | index-pack: correct "offset" type in unpack_entry_data()Nguyễn Thái Ngọc Duy2016-07-13
| * | | | | | | | | | | | | | | | | | | | | | index-pack: report correct bad object offsets even if they are largeNguyễn Thái Ngọc Duy2016-07-13
| * | | | | | | | | | | | | | | | | | | | | | index-pack: correct "len" type in unpack_data()Nguyễn Thái Ngọc Duy2016-07-13
| * | | | | | | | | | | | | | | | | | | | | | sha1_file.c: use type off_t* for object_info->disk_sizepNguyễn Thái Ngọc Duy2016-07-13
| * | | | | | | | | | | | | | | | | | | | | | pack-objects: pass length to check_pack_crc() without truncationNguyễn Thái Ngọc Duy2016-07-12
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/worktree-lock'Junio C Hamano2016-07-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | worktree.c: find_worktree() search by path suffixNguyễn Thái Ngọc Duy2016-07-08