Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/write-in-full-fix' into maint | Junio C Hamano | 2017-10-23 | 1 | -1/+1 |
|\ | |||||
| * | avoid "write_in_full(fd, buf, len) != len" pattern | Jeff King | 2017-09-14 | 1 | -1/+1 |
* | | Merge branch 'er/fast-import-dump-refs-on-checkpoint' into maint | Junio C Hamano | 2017-10-23 | 1 | -0/+142 |
|\ \ | |||||
| * | | fast-import: checkpoint: dump branches/tags/marks even if object_count==0 | Eric Rannaud | 2017-09-29 | 1 | -0/+142 |
| |/ | |||||
* | | Merge branch 'jt/fast-export-copy-modify-fix' into maint | Junio C Hamano | 2017-10-23 | 1 | -1/+19 |
|\ \ | |||||
| * | | fast-export: do not copy from modified file | Jonathan Tan | 2017-09-21 | 1 | -1/+19 |
* | | | Merge branch 'nd/worktree-kill-parse-ref' into maint | Junio C Hamano | 2017-10-23 | 1 | -0/+13 |
|\ \ \ | |||||
| * | | | branch: fix branch renaming not updating HEADs correctly | Nguyễn Thái Ngọc Duy | 2017-08-24 | 1 | -0/+13 |
* | | | | Merge branch 'jk/ref-filter-colors-fix' into maint | Junio C Hamano | 2017-10-18 | 12 | -62/+74 |
|\ \ \ \ | |||||
| * | | | | tag: respect color.ui config | Jeff King | 2017-10-17 | 2 | -0/+11 |
| * | | | | Revert "color: check color.ui in git_default_config()" | Jeff King | 2017-10-17 | 1 | -1/+1 |
| * | | | | Revert "t6006: drop "always" color config tests" | Jeff King | 2017-10-17 | 1 | -5/+15 |
| * | | | | Revert "color: make "always" the same as "auto" in config" | Jeff King | 2017-10-17 | 1 | -1/+1 |
| * | | | | Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt... | Junio C Hamano | 2017-10-17 | 12 | -79/+70 |
| |\ \ \ \ | |||||
| | * | | | | color: make "always" the same as "auto" in config | Jeff King | 2017-10-04 | 1 | -0/+10 |
| | * | | | | provide --color option for all ref-filter users | Jeff King | 2017-10-04 | 2 | -4/+4 |
| | * | | | | t3205: use --color instead of color.branch=always | Jeff King | 2017-10-04 | 1 | -3/+2 |
| | * | | | | t3203: drop "always" color test | Jeff King | 2017-10-04 | 1 | -6/+0 |
| | * | | | | t6006: drop "always" color config tests | Jeff King | 2017-10-04 | 1 | -15/+5 |
| | * | | | | t7502: use diff.noprefix for --verbose test | Jeff King | 2017-10-04 | 1 | -2/+2 |
| | * | | | | t7508: use test_terminal for color output | Jeff King | 2017-10-04 | 1 | -20/+21 |
| | * | | | | t3701: use test-terminal to collect color output | Jeff King | 2017-10-04 | 1 | -5/+3 |
| | * | | | | t4015: prefer --color to -c color.diff=always | Jeff King | 2017-10-04 | 1 | -14/+14 |
| | * | | | | test-terminal: set TERM=vt100 | Jeff King | 2017-10-04 | 7 | -10/+9 |
* | | | | | | Merge branch 'rs/fsck-null-return-from-lookup' into maint | Junio C Hamano | 2017-10-18 | 1 | -0/+22 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fsck: handle NULL return of lookup_blob() and lookup_tree() | René Scharfe | 2017-10-06 | 1 | -0/+22 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'rs/qsort-s' into maint | Junio C Hamano | 2017-10-18 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | test-stringlist: avoid buffer underrun when sorting nothing | René Scharfe | 2017-10-04 | 1 | -1/+1 |
* | | | | | | | Merge branch 'mr/doc-negative-pathspec' into maint | Junio C Hamano | 2017-10-18 | 1 | -1/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | docs: improve discoverability of exclude pathspec | Manav Rathi | 2017-09-25 | 1 | -1/+12 |
* | | | | | | | | Merge branch 'ks/test-readme-phrasofix' into maint | Junio C Hamano | 2017-10-18 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t/README: fix typo and grammatically improve a sentence | Kaartic Sivaraam | 2017-09-19 | 1 | -3/+3 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/drop-sha1-entry-pos' into maint | Junio C Hamano | 2017-10-18 | 2 | -11/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | sha1_file: drop experimental GIT_USE_LOOKUP search | Jeff King | 2017-08-09 | 2 | -11/+1 |
* | | | | | | | | | Merge branch 'tb/ref-filter-empty-modifier' into maint | Junio C Hamano | 2017-10-18 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | ref-filter.c: pass empty-string as NULL to atom parsers | Taylor Blau | 2017-10-05 | 1 | -0/+1 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ar/request-pull-phrasofix' into maint | Junio C Hamano | 2017-10-18 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | request-pull: capitalise "Git" to make it a proper noun | Ann T Ropea | 2017-10-03 | 1 | -2/+2 |
* | | | | | | | | | | Merge branch 'jk/diff-blob' into maint | Junio C Hamano | 2017-10-18 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | cat-file: handle NULL object_context.path | Jeff King | 2017-09-22 | 1 | -0/+5 |
* | | | | | | | | | | | Merge branch 'jk/describe-omit-some-refs' into maint | Junio C Hamano | 2017-10-18 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | describe: fix matching to actually match all patterns | Max Kirillov | 2017-09-17 | 1 | -1/+5 |
* | | | | | | | | | | | | Merge branch 'tb/test-lint-echo-e' into maint | Junio C Hamano | 2017-10-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | test-lint: echo -e (or -E) is not portable | Torsten Bögershausen | 2017-09-21 | 1 | -1/+1 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'rs/archive-excluded-directory' into maint | Junio C Hamano | 2017-10-18 | 3 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | archive: don't add empty directories to archives | René Scharfe | 2017-09-14 | 3 | -4/+4 |
* | | | | | | | | | | | | | Merge branch 'mh/packed-ref-store-prep' into maint | Junio C Hamano | 2017-10-18 | 1 | -2/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | rev-parse: don't trim bisect refnames | Jeff King | 2017-09-07 | 1 | -2/+16 |
* | | | | | | | | | | | | | | Merge branch 'mm/send-email-cc-cruft' into maint | Junio C Hamano | 2017-10-18 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | send-email: fix garbage removal after address | Matthieu Moy | 2017-08-24 | 1 | -0/+4 |