aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano2017-10-18
|\
| * tag: respect color.ui configJeff King2017-10-17
| * Revert "color: check color.ui in git_default_config()"Jeff King2017-10-17
| * Revert "t6006: drop "always" color config tests"Jeff King2017-10-17
| * Revert "color: make "always" the same as "auto" in config"Jeff King2017-10-17
| * Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...Junio C Hamano2017-10-17
| |\
* | \ Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-18
|\ \ \
| * | | sequencer.c: unify an error messageRalf Thielow2017-10-18
* | | | Crawling towards -rc2Junio C Hamano2017-10-17
* | | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-10-17
|\ \ \ \
| * | | | diff: fix infinite loop with --color-moved --ignore-space-changeJeff King2017-10-16
* | | | | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-17
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | sequencer.c: fix and unify error messages in rearrange_squash()Ralf Thielow2017-10-16
* | | | | Merge branch 'jc/doc-checkout'Junio C Hamano2017-10-17
|\ \ \ \ \
| * | | | | checkout doc: clarify command line args for "checkout paths" modeJunio C Hamano2017-10-11
| | |_|/ / | |/| | |
* | | | | Git 2.15-rc1Junio C Hamano2017-10-11
* | | | | Merge branch 'ls/filter-process-delayed'Junio C Hamano2017-10-11
|\ \ \ \ \
| * | | | | write_entry: untangle symlink and regular-file casesJeff King2017-10-10
| * | | | | write_entry: avoid reading blobs in CE_RETRY caseJeff King2017-10-10
| * | | | | write_entry: fix leak when retrying delayed filterJeff King2017-10-10
| * | | | | entry.c: check if file exists after checkoutLars Schneider2017-10-06
| * | | | | entry.c: update cache entry only for existing filesLars Schneider2017-10-05
* | | | | | Merge branch 'ds/avoid-overflow-in-midpoint-computation'Junio C Hamano2017-10-11
|\ \ \ \ \ \
| * | | | | | cleanup: fix possible overflow errors in binary searchDerrick Stolee2017-10-10
* | | | | | | Merge branch 'tb/complete-describe'Junio C Hamano2017-10-11
|\ \ \ \ \ \ \
| * | | | | | | completion: add --broken and --dirty to describeThomas Braun2017-10-07
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'sb/test-cmp-expect-actual'Junio C Hamano2017-10-11
|\ \ \ \ \ \ \
| * | | | | | | tests: fix diff order arguments in test_cmpStefan Beller2017-10-07
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/refs-df-conflict'Junio C Hamano2017-10-11
|\ \ \ \ \ \ \
| * | | | | | | refs_resolve_ref_unsafe: handle d/f conflicts for writesJeff King2017-10-07
| * | | | | | | t3308: create a real ref directory/file conflictJeff King2017-10-07
| |/ / / / / /
* | | | | | | Merge branch 'rs/rs-mailmap'Junio C Hamano2017-10-11
|\ \ \ \ \ \ \
| * | | | | | | .mailmap: normalize name for René ScharfeRené Scharfe2017-10-06
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'rs/fsck-null-return-from-lookup'Junio C Hamano2017-10-11
|\ \ \ \ \ \ \
| * | | | | | | fsck: handle NULL return of lookup_blob() and lookup_tree()René Scharfe2017-10-06
| |/ / / / / /
* | | | | | | Merge branch 'jk/sha1-loose-object-info-fix'Junio C Hamano2017-10-11
|\ \ \ \ \ \ \
| * | | | | | | sha1_loose_object_info: handle errors from unpack_sha1_restJeff King2017-10-06
| |/ / / / / /
* | | | | | | Merge branch 'hn/string-list-doc'Junio C Hamano2017-10-11
|\ \ \ \ \ \ \
| * | | | | | | api-argv-array.txt: remove broken link to string-list APITodd Zullinger2017-10-06
* | | | | | | | Merge branch 'tb/show-trailers-in-ref-filter'Junio C Hamano2017-10-11
|\ \ \ \ \ \ \ \
| * | | | | | | | ref-filter.c: parse trailers arguments with %(contents) atomTaylor Blau2017-10-02
| * | | | | | | | ref-filter.c: use trailer_opts to format trailersTaylor Blau2017-10-02
| * | | | | | | | t6300: refactor %(trailers) testsTaylor Blau2017-10-02
| * | | | | | | | doc: use "`<literal>`"-style quoting for literal stringsTaylor Blau2017-10-02
| * | | | | | | | doc: 'trailers' is the preferred way to format trailersTaylor Blau2017-10-02
| * | | | | | | | t4205: unfold across multiple linesTaylor Blau2017-10-02
* | | | | | | | | Merge branch 'jt/oidmap'Junio C Hamano2017-10-11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | oidmap: map with OID as keyJonathan Tan2017-10-01
* | | | | | | | | | Merge branch 'jr/hash-migration-plan-doc'Junio C Hamano2017-10-11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | technical doc: add a design doc for hash function transitionJonathan Nieder2017-09-28