summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* submodule_init: die cleanly on submodules without url definedjk/submodule-init-segv-fixJeff King2017-04-241-3/+3
* Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-09-081-3/+1
|\
| * receive-pack: use FLEX_ALLOC_MEM in queue_command()René Scharfe2016-08-131-3/+1
* | Merge branch 'rs/use-strbuf-add-unique-abbrev' into maintJunio C Hamano2016-09-081-2/+1
|\ \
| * | use strbuf_add_unique_abbrev() for adding short hashesrs/use-strbuf-add-unique-abbrevRené Scharfe2016-08-061-2/+1
* | | Merge branch 'rs/merge-add-strategies-simplification' into maintJunio C Hamano2016-09-081-34/+10
|\ \ \
| * | | merge: use string_list_split() in add_strategies()rs/merge-add-strategies-simplificationRené Scharfe2016-08-051-34/+10
| |/ /
* | | Merge branch 'js/no-html-bypass-on-windows' into maintJunio C Hamano2016-09-081-7/+0
|\ \ \
| * | | Revert "display HTML in default browser using Windows' shell API"js/no-html-bypass-on-windowsJohannes Schindelin2016-08-191-7/+0
* | | | Merge branch 'sb/checkout-explit-detach-no-advice' into maintJunio C Hamano2016-09-081-1/+2
|\ \ \ \
| * | | | checkout: do not mention detach advice for explicit --detach optionsb/checkout-explit-detach-no-adviceStefan Beller2016-08-151-1/+2
* | | | | Merge branch 'js/mv-dir-to-new-directory' into maintJunio C Hamano2016-09-081-4/+7
|\ \ \ \ \
| * | | | | git mv: do not keep slash in `git mv dir non-existing-dir/`js/mv-dir-to-new-directoryJohannes Schindelin2016-08-081-4/+7
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/reflog-date' into maintJunio C Hamano2016-09-081-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | date: add "unix" formatJeff King2016-07-271-0/+3
* | | | | Merge branch 'jk/reset-ident-time-per-commit' into maintJunio C Hamano2016-08-121-0/+2
|\ \ \ \ \
| * | | | | am: reset cached ident date for each patchjk/reset-ident-time-per-commitJeff King2016-08-011-0/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs/use-strbuf-addstr' into maintJunio C Hamano2016-08-102-2/+2
|\ \ \ \ \
| * | | | | use strbuf_addstr() instead of strbuf_addf() with "%s"rs/use-strbuf-addstrRené Scharfe2016-08-051-1/+1
| * | | | | use strbuf_addstr() for adding constant strings to a strbufRené Scharfe2016-08-011-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'os/no-verify-skips-commit-msg-too' into maintJunio C Hamano2016-08-101-1/+1
|\ \ \ \ \
| * | | | | commit: describe that --no-verify skips the commit-msg hook in the help textos/no-verify-skips-commit-msg-tooOrgad Shaneh2016-07-261-1/+1
* | | | | | Merge branch 'rs/rm-strbuf-optim' into maintJunio C Hamano2016-08-101-2/+3
|\ \ \ \ \ \
| * | | | | | rm: reuse strbuf for all remove_dir_recursively() callsrs/rm-strbuf-optimRené Scharfe2016-07-121-2/+3
* | | | | | | Merge branch 'jk/parse-options-concat' into maintJunio C Hamano2016-08-101-9/+4
|\ \ \ \ \ \ \
| * | | | | | | parse_options: allocate a new array when concatenatingjk/parse-options-concatJeff King2016-07-061-9/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'pb/commit-editmsg-path' into maintJunio C Hamano2016-08-081-7/+8
|\ \ \ \ \ \ \
| * | | | | | | builtin/commit.c: memoize git-path for COMMIT_EDITMSGpb/commit-editmsg-pathPranit Bauva2016-06-091-7/+8
* | | | | | | | Merge branch 'nd/pack-ofs-4gb-limit' into maintJunio C Hamano2016-08-084-21/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | fsck: use streaming interface for large blobs in packnd/pack-ofs-4gb-limitNguyễn Thái Ngọc Duy2016-07-131-0/+4
| * | | | | | | | 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-131-2/+2
| * | | | | | | | pack-objects: pass length to check_pack_crc() without truncationNguyễn Thái Ngọc Duy2016-07-121-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mh/blame-worktree' into maintJunio C Hamano2016-08-081-1/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | blame: allow to blame paths freshly added to the indexMike Hommey2016-07-181-1/+9
| |/ / / / / /
* | | | | | | Merge branch 'dk/blame-move-no-reason-for-1-line-context' into maintJunio C Hamano2016-07-281-4/+3
|\ \ \ \ \ \ \
| * | | | | | | blame: require 0 context lines while finding moved lines with -Mks/blame-move-no-reason-for-1-line-contextdk/blame-move-no-reason-for-1-line-contextDavid Kastrup2016-05-291-4/+3
* | | | | | | | Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maintJunio C Hamano2016-07-281-8/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | am: counteract gender biasjs/am-call-theirs-theirs-in-fallback-3wayJohannes Schindelin2016-07-081-8/+8
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ew/gc-auto-pack-limit-fix' into maintJunio C Hamano2016-07-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | gc: fix off-by-one error with gc.autoPackLimitew/gc-auto-pack-limit-fixEric Wong2016-06-271-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-07-281-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | grep: fix grepping for "intent to add" filesnd/ita-cleanupCharles Bailey2016-07-011-2/+2
* | | | | | | | | Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintJunio C Hamano2016-07-282-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | reset --hard: skip blank lines when reporting the commit subjectjs/find-commit-subject-ignore-leading-blanksJohannes Schindelin2016-06-291-1/+1
| * | | | | | | | commit -C: skip blank lines at the beginning of the messageJohannes Schindelin2016-06-291-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'sb/clone-shallow-passthru' into maintJunio C Hamano2016-07-111-3/+2
|\ \ \ \ \ \ \ \
View Lorry Controller Status