Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ma/ts-cleanups' into maint | Junio C Hamano | 2017-10-23 | 1 | -0/+6 |
|\ | |||||
| * | pack-objects: take lock before accessing `remaining` | Martin Ågren | 2017-08-23 | 1 | -0/+6 |
* | | Merge branch 'jt/fast-export-copy-modify-fix' into maint | Junio C Hamano | 2017-10-23 | 1 | -14/+32 |
|\ \ | |||||
| * | | fast-export: do not copy from modified filejt/fast-export-copy-modify-fix | Jonathan Tan | 2017-09-21 | 1 | -14/+32 |
* | | | Merge branch 'jk/ref-filter-colors-fix' into maint | Junio C Hamano | 2017-10-18 | 6 | -5/+8 |
|\ \ \ | |||||
| * | | | tag: respect color.ui configjk/ref-filter-colors-fix | Jeff King | 2017-10-17 | 1 | -1/+1 |
| * | | | Revert "color: check color.ui in git_default_config()" | Jeff King | 2017-10-17 | 4 | -4/+5 |
| * | | | Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt... | Junio C Hamano | 2017-10-17 | 2 | -0/+2 |
| |\ \ \ | |||||
| | * | | | provide --color option for all ref-filter users | Jeff King | 2017-10-04 | 2 | -0/+2 |
* | | | | | Merge branch 'sb/branch-avoid-repeated-strbuf-release' into maint | Junio C Hamano | 2017-10-18 | 1 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | branch: reset instead of release a strbufsb/branch-avoid-repeated-strbuf-release | Stefan Beller | 2017-10-04 | 1 | -2/+3 |
| |/ / / / | |||||
* | | | | | Merge branch 'mg/timestamp-t-fix' into maint | Junio C Hamano | 2017-10-18 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | name-rev: change ULONG_MAX to TIME_MAXmg/timestamp-t-fix | Michael J Gruber | 2017-09-06 | 1 | -1/+1 |
* | | | | | | Merge branch 'jk/diff-blob' into maint | Junio C Hamano | 2017-10-18 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | cat-file: handle NULL object_context.pathjk/diff-blob | Jeff King | 2017-09-22 | 1 | -2/+2 |
* | | | | | | | Merge branch 'jk/describe-omit-some-refs' into maint | Junio C Hamano | 2017-10-18 | 1 | -3/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | describe: fix matching to actually match all patternsjk/describe-omit-some-refs | Max Kirillov | 2017-09-17 | 1 | -3/+6 |
* | | | | | | | | Merge branch 'aw/gc-lockfile-fscanf-fix' into maint | Junio C Hamano | 2017-10-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | gc: call fscanf() with %<len>s, not %<len>c, when reading hostnameaw/gc-lockfile-fscanf-fix | Junio C Hamano | 2017-09-17 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'rk/commit-tree-make-F-verbatim' into maint | Junio C Hamano | 2017-10-18 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | commit-tree: do not complete line in -F inputrk/commit-tree-make-F-verbatim | Ross Kabus | 2017-09-10 | 1 | -1/+0 |
* | | | | | | | | | | Merge branch 'mh/packed-ref-store-prep' into maint | Junio C Hamano | 2017-10-18 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | rev-parse: don't trim bisect refnamesmh/packed-ref-store-prep | Jeff King | 2017-09-07 | 1 | -2/+2 |
* | | | | | | | | | | Merge branch 'rs/merge-microcleanup' into maint | Junio C Hamano | 2017-09-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | merge: use skip_prefix()rs/merge-microcleanup | René Scharfe | 2017-08-10 | 1 | -2/+2 |
* | | | | | | | | | | | Merge branch 'rj/add-chmod-error-message' into maint | Junio C Hamano | 2017-09-10 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | builtin/add: add detail to a 'cannot chmod' error messagerj/add-chmod-error-message | Ramsay Jones | 2017-08-09 | 1 | -3/+3 |
* | | | | | | | | | | | | Merge branch 'mg/killed-merge' into maint | Junio C Hamano | 2017-09-10 | 1 | -3/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | merge: save merge state earliermg/killed-merge | Michael J Gruber | 2017-08-23 | 1 | -0/+2 |
| * | | | | | | | | | | | | merge: split write_merge_state in two | Michael J Gruber | 2017-08-23 | 1 | -3/+8 |
| * | | | | | | | | | | | | merge: clarify call chain | Michael J Gruber | 2017-08-23 | 1 | -0/+2 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'rs/fsck-obj-leakfix' into maint | Junio C Hamano | 2017-09-10 | 1 | -11/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | fsck: free buffers on error in fsck_obj()rs/fsck-obj-leakfix | René Scharfe | 2017-08-10 | 1 | -11/+11 |
* | | | | | | | | | | | | | Merge branch 'pw/am-signoff' into maint | Junio C Hamano | 2017-09-10 | 1 | -25/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | am: fix signoff when other trailers are presentpw/am-signoff | Phillip Wood | 2017-08-08 | 1 | -25/+1 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'bw/clone-recursive-quiet' into maint | Junio C Hamano | 2017-09-10 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | clone: teach recursive clones to respect -qbw/clone-recursive-quiet | Brandon Williams | 2017-08-04 | 1 | -0/+3 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge branch 'jk/gc-pre-detach-under-hook' into maint | Junio C Hamano | 2017-07-31 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pw/sequence-rerere-autoupdate' into maint | Junio C Hamano | 2017-09-10 | 2 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | cherry-pick/revert: reject --rerere-autoupdate when continuingpw/sequence-rerere-autoupdate | Phillip Wood | 2017-08-02 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | am: remember --rerere-autoupdate setting | Phillip Wood | 2017-08-02 | 1 | -0/+12 |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules' into maint | Junio C Hamano | 2017-09-10 | 1 | -9/+40 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | submodule--helper: teach push-check to handle HEADbw/push-options-recursively-to-submodules | Brandon Williams | 2017-07-20 | 1 | -9/+40 |
* | | | | | | | | | | | | | | | Merge branch 'ma/pager-per-subcommand-action' into maint | Junio C Hamano | 2017-09-10 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | tag: change default of `pager.tag` to "on" | Martin Ågren | 2017-08-03 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | tag: respect `pager.tag` in list-mode only | Martin Ågren | 2017-08-03 | 1 | -0/+3 |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'jk/rev-list-empty-input' into maint | Junio C Hamano | 2017-09-10 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | rev-list: don't show usage when we see empty ref patterns | Jeff King | 2017-08-02 | 1 | -1/+2 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch 'jt/subprocess-handshake' into maint | Junio C Hamano | 2017-08-23 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake | Junio C Hamano | 2017-07-26 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |