summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* version --build-options: report commit, too, if possiblejs/enhanced-version-infoJohannes Schindelin2017-12-144-1/+10
* version --build-options: also report host CPUEric Sunshine2017-12-142-0/+10
* RelNotes: minor typo fixes in 2.16.0 draftTodd Zullinger2017-12-141-2/+2
* RelNotes: the ninth batchJunio C Hamano2017-12-131-0/+31
* Merge branch 'js/hashmap-update-sample'Junio C Hamano2017-12-131-31/+29
|\
| * hashmap: adjust documentation to reflect realityjs/hashmap-update-sampleJohannes Schindelin2017-12-051-31/+29
* | Merge branch 'en/remove-stripspace'Junio C Hamano2017-12-131-9/+0
|\ \
| * | strbuf: remove unused stripspace function aliasen/remove-stripspaceElijah Newren2017-12-051-9/+0
* | | Merge branch 'jk/no-optional-locks'Junio C Hamano2017-12-131-0/+13
|\ \ \
| * | | git-status.txt: mention --no-optional-locksjk/no-optional-locksJeff King2017-11-271-0/+13
* | | | Merge branch 'ds/for-each-file-in-obj-micro-optim'Junio C Hamano2017-12-132-5/+11
|\ \ \ \
| * | | | sha1_file: use strbuf_add() instead of strbuf_addf()ds/for-each-file-in-obj-micro-optimDerrick Stolee2017-12-042-5/+11
| | |/ / | |/| |
* | | | Merge branch 'jk/progress-delay-fix'Junio C Hamano2017-12-131-19/+5
|\ \ \ \
| * | | | progress: drop delay-threshold codejk/progress-delay-fixLars Schneider2017-12-041-19/+5
| * | | | progress: set default delay threshold to 100%, not 0%Jeff King2017-12-041-1/+1
* | | | | Merge branch 'ks/doc-checkout-previous'Junio C Hamano2017-12-131-4/+4
|\ \ \ \ \
| * | | | | Doc/checkout: checking out using @{-N} can lead to detached stateks/doc-checkout-previousKaartic Sivaraam2017-11-281-4/+4
* | | | | | Merge branch 'fk/sendmail-from-path'Junio C Hamano2017-12-132-4/+6
|\ \ \ \ \ \
| * | | | | | git-send-email: honor $PATH for sendmail binaryfk/sendmail-from-pathFlorian Klink2017-11-282-4/+6
* | | | | | | Merge branch 'tg/t-readme-updates'Junio C Hamano2017-12-131-4/+6
|\ \ \ \ \ \ \
| * | | | | | | t/README: document test_cmp_revtg/t-readme-updatesThomas Gummerer2017-11-271-0/+5
| * | | | | | | t/README: remove mention of adding copyright noticesThomas Gummerer2017-11-271-4/+1
* | | | | | | | Merge branch 'pc/submodule-helper'Junio C Hamano2017-12-131-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule--helper.c: i18n: add a missing space in messageJean-Noel Avila2017-11-261-1/+1
* | | | | | | | | Merge branch 'jc/receive-pack-hook-doc'Junio C Hamano2017-12-131-10/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | hooks doc: clarify when receive-pack invokes its hooksjc/receive-pack-hook-docJunio C Hamano2017-11-241-10/+10
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ab/pcre2-grep'Junio C Hamano2017-12-134-0/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | grep: fix segfault under -P + PCRE2 <=10.30 + (*NO_JIT)ab/pcre2-grepÆvar Arnfjörð Bjarmason2017-11-242-0/+32
| * | | | | | | | | test-lib: add LIBPCRE1 & LIBPCRE2 prerequisitesÆvar Arnfjörð Bjarmason2017-11-242-0/+14
* | | | | | | | | | Merge branch 'ra/decorate-limit-refs'Junio C Hamano2017-12-139-11/+232
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | log: add option to choose which refs to decoratera/decorate-limit-refsRafael Ascensão2017-11-229-11/+232
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'bc/hash-algo'Junio C Hamano2017-12-1315-37/+175
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | repository: fix a sparse 'using integer as NULL pointer' warningRamsay Jones2017-11-281-1/+1
| * | | | | | | | | | Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-1310-15/+15
| * | | | | | | | | | Integrate hash algorithm support with repo setupbrian m. carlson2017-11-134-0/+19
| * | | | | | | | | | Add structure representing hash algorithmbrian m. carlson2017-11-132-0/+115
| * | | | | | | | | | setup: expose enumerated repo infobrian m. carlson2017-11-131-21/+25
* | | | | | | | | | | RelNotes: the eighth batchJunio C Hamano2017-12-061-13/+45
* | | | | | | | | | | Sync with maintJunio C Hamano2017-12-061-0/+47
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Prepare for 2.15.2maint-2.15Junio C Hamano2017-12-062-1/+48
| * | | | | | | | | | | Merge branch 'jc/merge-base-fork-point-doc' into maintJunio C Hamano2017-12-061-8/+56
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tz/redirect-fix' into maintJunio C Hamano2017-12-062-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tz/notes-error-to-stderr' into maintJunio C Hamano2017-12-063-9/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' into maintJunio C Hamano2017-12-062-2/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pw/sequencer-recover-from-unlockable-index' into maintJunio C Hamano2017-12-061-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maintJunio C Hamano2017-12-062-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tz/complete-branch-copy' into maintJunio C Hamano2017-12-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/rebase-mboxrd' into maintJunio C Hamano2017-12-062-0/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sd/branch-copy' into maintJunio C Hamano2017-12-061-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sw/pull-ipv46-passthru' into maintJunio C Hamano2017-12-061-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \