summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pull: pass --signoff/--no-signoff to "git merge"wk/pull-signoffW. Trevor King2017-10-134-8/+61
* Git 2.15-rc1v2.15.0-rc1Junio C Hamano2017-10-112-1/+18
* Merge branch 'ls/filter-process-delayed'Junio C Hamano2017-10-111-36/+52
|\
| * write_entry: untangle symlink and regular-file casesls/filter-process-delayedJeff King2017-10-101-31/+40
| * write_entry: avoid reading blobs in CE_RETRY caseJeff King2017-10-101-11/+14
| * write_entry: fix leak when retrying delayed filterJeff King2017-10-101-0/+1
| * entry.c: check if file exists after checkoutLars Schneider2017-10-061-1/+3
| * entry.c: update cache entry only for existing filesLars Schneider2017-10-051-1/+2
* | Merge branch 'ds/avoid-overflow-in-midpoint-computation'Junio C Hamano2017-10-1112-15/+15
|\ \
| * | cleanup: fix possible overflow errors in binary searchds/avoid-overflow-in-midpoint-computationDerrick Stolee2017-10-1012-15/+15
* | | Merge branch 'tb/complete-describe'Junio C Hamano2017-10-111-1/+1
|\ \ \
| * | | completion: add --broken and --dirty to describetb/complete-describeThomas Braun2017-10-071-1/+1
* | | | Merge branch 'sb/test-cmp-expect-actual'Junio C Hamano2017-10-1114-41/+41
|\ \ \ \
| * | | | tests: fix diff order arguments in test_cmpsb/test-cmp-expect-actualStefan Beller2017-10-0715-42/+42
| | |/ / | |/| |
* | | | Merge branch 'jk/refs-df-conflict'Junio C Hamano2017-10-114-3/+50
|\ \ \ \
| * | | | refs_resolve_ref_unsafe: handle d/f conflicts for writesjk/refs-df-conflictJeff King2017-10-073-2/+49
| * | | | t3308: create a real ref directory/file conflictJeff King2017-10-071-1/+1
| |/ / /
* | | | Merge branch 'rs/rs-mailmap'Junio C Hamano2017-10-111-0/+1
|\ \ \ \
| * | | | .mailmap: normalize name for René Scharfers/rs-mailmapRené Scharfe2017-10-061-0/+1
| | |/ / | |/| |
* | | | Merge branch 'rs/fsck-null-return-from-lookup'Junio C Hamano2017-10-112-4/+26
|\ \ \ \
| * | | | fsck: handle NULL return of lookup_blob() and lookup_tree()rs/fsck-null-return-from-lookupRené Scharfe2017-10-062-4/+26
| |/ / /
* | | | Merge branch 'jk/sha1-loose-object-info-fix'Junio C Hamano2017-10-111-2/+6
|\ \ \ \
| * | | | sha1_loose_object_info: handle errors from unpack_sha1_restjk/sha1-loose-object-info-fixJeff King2017-10-061-2/+6
| |/ / /
* | | | Merge branch 'hn/string-list-doc'Junio C Hamano2017-10-111-1/+1
|\ \ \ \
| * | | | api-argv-array.txt: remove broken link to string-list APIhn/string-list-docTodd Zullinger2017-10-061-1/+1
* | | | | Merge branch 'tb/show-trailers-in-ref-filter'Junio C Hamano2017-10-114-17/+122
|\ \ \ \ \
| * | | | | ref-filter.c: parse trailers arguments with %(contents) atomtb/show-trailers-in-ref-filterTaylor Blau2017-10-022-3/+42
| * | | | | ref-filter.c: use trailer_opts to format trailersTaylor Blau2017-10-023-10/+68
| * | | | | t6300: refactor %(trailers) testsTaylor Blau2017-10-021-2/+9
| * | | | | doc: use "`<literal>`"-style quoting for literal stringsTaylor Blau2017-10-021-3/+3
| * | | | | doc: 'trailers' is the preferred way to format trailersTaylor Blau2017-10-021-1/+2
| * | | | | t4205: unfold across multiple linesTaylor Blau2017-10-021-1/+1
* | | | | | Merge branch 'jt/oidmap'Junio C Hamano2017-10-116-31/+133
|\ \ \ \ \ \
| * | | | | | oidmap: map with OID as keyjt/oidmapJonathan Tan2017-10-016-31/+133
* | | | | | | Merge branch 'jr/hash-migration-plan-doc'Junio C Hamano2017-10-112-0/+798
|\ \ \ \ \ \ \
| * | | | | | | technical doc: add a design doc for hash function transitionjr/hash-migration-plan-docJonathan Nieder2017-09-282-0/+798
* | | | | | | | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-091-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | i18n: add a missing space in messageJean-Noel Avila2017-10-091-1/+1
* | | | | | | | | Prepare for -rc1Junio C Hamano2017-10-071-3/+38
* | | | | | | | | Merge branch 'tb/ref-filter-empty-modifier'Junio C Hamano2017-10-072-1/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ref-filter.c: pass empty-string as NULL to atom parserstb/ref-filter-empty-modifierTaylor Blau2017-10-052-1/+10
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ks/verify-filename-non-option-error-message-tweak'Junio C Hamano2017-10-071-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | setup: update error message to be more meaningfulks/verify-filename-non-option-error-message-tweakKaartic Sivaraam2017-10-041-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ks/branch-tweak-error-message-for-extra-args'Junio C Hamano2017-10-071-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | branch: change the error messages to be more meaningfulks/branch-tweak-error-message-for-extra-argsKaartic Sivaraam2017-10-041-3/+3
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/ui-color-always-to-auto'Junio C Hamano2017-10-0719-113/+115
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autojk/ui-color-always-to-autoJunio C Hamano2017-10-0419-99/+101
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | color: make "always" the same as "auto" in configJeff King2017-10-043-19/+28
| | * | | | | | | | | provide --color option for all ref-filter usersJeff King2017-10-046-4/+16
| | * | | | | | | | | t3205: use --color instead of color.branch=alwaysJeff King2017-10-041-3/+2
View Lorry Controller Status