summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/write-in-full-fix' into maintJunio C Hamano2017-10-234-5/+4
|\
| * avoid "write_in_full(fd, buf, len) != len" patternJeff King2017-09-143-3/+3
| * get-tar-commit-id: check write_in_full() return against 0Jeff King2017-09-141-2/+1
* | Merge branch 'rj/no-sign-compare' into maintJunio C Hamano2017-10-231-2/+2
|\ \
| * | ALLOC_GROW: avoid -Wsign-compare warningsrj/no-sign-compareRamsay Jones2017-09-221-2/+2
| |/
* | Merge branch 'ma/ts-cleanups' into maintJunio C Hamano2017-10-231-0/+6
|\ \
| * | pack-objects: take lock before accessing `remaining`Martin Ågren2017-08-231-0/+6
* | | Merge branch 'jt/fast-export-copy-modify-fix' into maintJunio C Hamano2017-10-231-14/+32
|\ \ \
| * | | fast-export: do not copy from modified filejt/fast-export-copy-modify-fixJonathan Tan2017-09-211-14/+32
* | | | Merge branch 'jk/ref-filter-colors-fix' into maintJunio C Hamano2017-10-186-5/+8
|\ \ \ \
| * | | | tag: respect color.ui configjk/ref-filter-colors-fixJeff King2017-10-171-1/+1
| * | | | Revert "color: check color.ui in git_default_config()"Jeff King2017-10-174-4/+5
| * | | | Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...Junio C Hamano2017-10-172-0/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | provide --color option for all ref-filter usersJeff King2017-10-042-0/+2
* | | | | Merge branch 'sb/branch-avoid-repeated-strbuf-release' into maintJunio C Hamano2017-10-181-2/+3
|\ \ \ \ \
| * | | | | branch: reset instead of release a strbufsb/branch-avoid-repeated-strbuf-releaseStefan Beller2017-10-041-2/+3
| |/ / / /
* | | | | Merge branch 'mg/timestamp-t-fix' into maintJunio C Hamano2017-10-181-1/+1
|\ \ \ \ \
| * | | | | name-rev: change ULONG_MAX to TIME_MAXmg/timestamp-t-fixMichael J Gruber2017-09-061-1/+1
* | | | | | Merge branch 'jk/diff-blob' into maintJunio C Hamano2017-10-181-2/+2
|\ \ \ \ \ \
| * | | | | | cat-file: handle NULL object_context.pathjk/diff-blobJeff King2017-09-221-2/+2
* | | | | | | Merge branch 'jk/describe-omit-some-refs' into maintJunio C Hamano2017-10-181-3/+6
|\ \ \ \ \ \ \
| * | | | | | | describe: fix matching to actually match all patternsjk/describe-omit-some-refsMax Kirillov2017-09-171-3/+6
* | | | | | | | Merge branch 'aw/gc-lockfile-fscanf-fix' into maintJunio C Hamano2017-10-181-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | gc: call fscanf() with %<len>s, not %<len>c, when reading hostnameaw/gc-lockfile-fscanf-fixJunio C Hamano2017-09-171-1/+1
* | | | | | | | | Merge branch 'rk/commit-tree-make-F-verbatim' into maintJunio C Hamano2017-10-181-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit-tree: do not complete line in -F inputrk/commit-tree-make-F-verbatimRoss Kabus2017-09-101-1/+0
* | | | | | | | | | Merge branch 'mh/packed-ref-store-prep' into maintJunio C Hamano2017-10-181-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | rev-parse: don't trim bisect refnamesmh/packed-ref-store-prepJeff King2017-09-071-2/+2
* | | | | | | | | | Merge branch 'rs/merge-microcleanup' into maintJunio C Hamano2017-09-101-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge: use skip_prefix()rs/merge-microcleanupRené Scharfe2017-08-101-2/+2
* | | | | | | | | | | Merge branch 'rj/add-chmod-error-message' into maintJunio C Hamano2017-09-101-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | builtin/add: add detail to a 'cannot chmod' error messagerj/add-chmod-error-messageRamsay Jones2017-08-091-3/+3
* | | | | | | | | | | | Merge branch 'mg/killed-merge' into maintJunio C Hamano2017-09-101-3/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | merge: save merge state earliermg/killed-mergeMichael J Gruber2017-08-231-0/+2
| * | | | | | | | | | | | merge: split write_merge_state in twoMichael J Gruber2017-08-231-3/+8
| * | | | | | | | | | | | merge: clarify call chainMichael J Gruber2017-08-231-0/+2
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs/fsck-obj-leakfix' into maintJunio C Hamano2017-09-101-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fsck: free buffers on error in fsck_obj()rs/fsck-obj-leakfixRené Scharfe2017-08-101-11/+11
* | | | | | | | | | | | | Merge branch 'pw/am-signoff' into maintJunio C Hamano2017-09-101-25/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am: fix signoff when other trailers are presentpw/am-signoffPhillip Wood2017-08-081-25/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'bw/clone-recursive-quiet' into maintJunio C Hamano2017-09-101-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clone: teach recursive clones to respect -qbw/clone-recursive-quietBrandon Williams2017-08-041-0/+3
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'jk/gc-pre-detach-under-hook' into maintJunio C Hamano2017-07-311-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pw/sequence-rerere-autoupdate' into maintJunio C Hamano2017-09-102-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | cherry-pick/revert: reject --rerere-autoupdate when continuingpw/sequence-rerere-autoupdatePhillip Wood2017-08-021-0/+2
| * | | | | | | | | | | | | | am: remember --rerere-autoupdate settingPhillip Wood2017-08-021-0/+12
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules' into maintJunio C Hamano2017-09-101-9/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | submodule--helper: teach push-check to handle HEADbw/push-options-recursively-to-submodulesBrandon Williams2017-07-201-9/+40
* | | | | | | | | | | | | | | Merge branch 'ma/pager-per-subcommand-action' into maintJunio C Hamano2017-09-101-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | tag: change default of `pager.tag` to "on"Martin Ågren2017-08-031-1/+1
View Lorry Controller Status