aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jt/diff-anchored-patience'Junio C Hamano2017-12-19
|\
| * diff: support anchoring line(s)Jonathan Tan2017-11-28
* | Merge branch 'en/merge-recursive-icase-removal'Junio C Hamano2017-12-19
|\ \
| * | merge-recursive: ignore_case shouldn't reject intentional removalsElijah Newren2017-11-27
* | | Merge branch 'en/rename-progress'Junio C Hamano2017-12-19
|\ \ \
| * | | diffcore-rename: make diff-tree -l0 mean -l<large>Jonathan Tan2017-12-02
| * | | sequencer: show rename progress during cherry picksElijah Newren2017-11-15
| * | | diff: remove silent clamp of renameLimitElijah Newren2017-11-15
| * | | progress: fix progress meters when dealing with lots of workElijah Newren2017-11-15
| * | | sequencer: warn when internal merge may be suboptimal due to renameLimitElijah Newren2017-11-14
* | | | RelNotes: minor typo fixes in 2.16.0 draftTodd Zullinger2017-12-14
* | | | RelNotes: the ninth batchJunio C Hamano2017-12-13
* | | | Merge branch 'js/hashmap-update-sample'Junio C Hamano2017-12-13
|\ \ \ \
| * | | | hashmap: adjust documentation to reflect realityJohannes Schindelin2017-12-05
* | | | | Merge branch 'en/remove-stripspace'Junio C Hamano2017-12-13
|\ \ \ \ \
| * | | | | strbuf: remove unused stripspace function aliasElijah Newren2017-12-05
* | | | | | Merge branch 'jk/no-optional-locks'Junio C Hamano2017-12-13
|\ \ \ \ \ \
| * | | | | | git-status.txt: mention --no-optional-locksJeff King2017-11-27
* | | | | | | Merge branch 'ds/for-each-file-in-obj-micro-optim'Junio C Hamano2017-12-13
|\ \ \ \ \ \ \
| * | | | | | | sha1_file: use strbuf_add() instead of strbuf_addf()Derrick Stolee2017-12-04
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/progress-delay-fix'Junio C Hamano2017-12-13
|\ \ \ \ \ \ \
| * | | | | | | progress: drop delay-threshold codeLars Schneider2017-12-04
| * | | | | | | progress: set default delay threshold to 100%, not 0%Jeff King2017-12-04
* | | | | | | | Merge branch 'ks/doc-checkout-previous'Junio C Hamano2017-12-13
|\ \ \ \ \ \ \ \
| * | | | | | | | Doc/checkout: checking out using @{-N} can lead to detached stateKaartic Sivaraam2017-11-28
* | | | | | | | | Merge branch 'fk/sendmail-from-path'Junio C Hamano2017-12-13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-send-email: honor $PATH for sendmail binaryFlorian Klink2017-11-28
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'tg/t-readme-updates'Junio C Hamano2017-12-13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t/README: document test_cmp_revThomas Gummerer2017-11-27
| * | | | | | | | | t/README: remove mention of adding copyright noticesThomas Gummerer2017-11-27
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'pc/submodule-helper'Junio C Hamano2017-12-13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule--helper.c: i18n: add a missing space in messageJean-Noel Avila2017-11-26
* | | | | | | | | | Merge branch 'jc/receive-pack-hook-doc'Junio C Hamano2017-12-13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | hooks doc: clarify when receive-pack invokes its hooksJunio C Hamano2017-11-24
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ab/pcre2-grep'Junio C Hamano2017-12-13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | grep: fix segfault under -P + PCRE2 <=10.30 + (*NO_JIT)Ævar Arnfjörð Bjarmason2017-11-24
| * | | | | | | | | | test-lib: add LIBPCRE1 & LIBPCRE2 prerequisitesÆvar Arnfjörð Bjarmason2017-11-24
* | | | | | | | | | | Merge branch 'ra/decorate-limit-refs'Junio C Hamano2017-12-13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | log: add option to choose which refs to decorateRafael Ascensão2017-11-22
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'bc/hash-algo'Junio C Hamano2017-12-13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | repository: fix a sparse 'using integer as NULL pointer' warningRamsay Jones2017-11-28
| * | | | | | | | | | | Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-13
| * | | | | | | | | | | Integrate hash algorithm support with repo setupbrian m. carlson2017-11-13
| * | | | | | | | | | | Add structure representing hash algorithmbrian m. carlson2017-11-13
| * | | | | | | | | | | setup: expose enumerated repo infobrian m. carlson2017-11-13
* | | | | | | | | | | | RelNotes: the eighth batchJunio C Hamano2017-12-06
* | | | | | | | | | | | Sync with maintJunio C Hamano2017-12-06
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Prepare for 2.15.2Junio C Hamano2017-12-06
| * | | | | | | | | | | | Merge branch 'jc/merge-base-fork-point-doc' into maintJunio C Hamano2017-12-06
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tz/redirect-fix' into maintJunio C Hamano2017-12-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \