summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2017-01-311-0/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Ready for 2.11.1Junio C Hamano2017-01-311-0/+45
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/in-core-index-doc' into maintJunio C Hamano2017-01-313-22/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/mingw-isatty' into maintJunio C Hamano2017-01-311-7/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/coding-guidelines-update' into maintJunio C Hamano2017-01-311-5/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/exec-path-coverity-workaround' into maintJunio C Hamano2017-01-311-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ad/bisect-terms' into maintJunio C Hamano2017-01-311-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/grep-e-could-be-extended-beyond-posix' into maintJunio C Hamano2017-01-311-11/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'km/branch-get-push-while-detached' into maintJunio C Hamano2017-01-312-3/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-i-squash-count-fix' into maintJunio C Hamano2017-01-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/blame-fixes' into maintJunio C Hamano2017-01-313-10/+166
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/archive-zip-userdiff-config' into maintJunio C Hamano2017-01-312-4/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/disable-bitmap-in-auto-gc' into maintJunio C Hamano2017-01-314-6/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/config-misc-fixes' into maintJunio C Hamano2017-01-311-5/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/abbrev-autoscale-config' into maintJunio C Hamano2017-01-312-8/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/fast-import-notes-fix-new' into maintJunio C Hamano2017-01-312-3/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/compression-config' into maintJunio C Hamano2017-01-319-31/+158
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/svn-fixes' into maintJunio C Hamano2017-01-312-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/travis-p4-on-macos' into maintJunio C Hamano2017-01-311-10/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/make-tags-find-sources-tweak' into maintJunio C Hamano2017-01-311-3/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/latin-1' into maintJunio C Hamano2017-01-311-11/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eighth batch for 2.12Junio C Hamano2017-01-311-2/+61
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fsck-connectivity-check-fix'Junio C Hamano2017-01-313-40/+158
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: lazily load types under --connectivity-onlyjk/fsck-connectivity-check-fixJeff King2017-01-262-51/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: move typename() printing to its own functionJeff King2017-01-261-9/+20
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t1450: use "mv -f" within loose object directoryJeff King2017-01-251-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: check HAS_OBJ more consistentlyJeff King2017-01-171-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: do not fallback "git fsck <bogus>" to "git fsck"Jeff King2017-01-172-1/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: tighten error-checks of "git fsck <head>"Jeff King2017-01-172-2/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: prepare dummy objects for --connectivity-checkJeff King2017-01-172-25/+124
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: report trees as danglingJeff King2017-01-172-1/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t1450: clean up sub-objects in duplicate-entry testJeff King2017-01-171-1/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/difftool-builtin'Junio C Hamano2017-01-316-47/+741
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | difftool: hack around -Wzero-length-format warningJeff King2017-01-251-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | difftool: retire the scripted versionJohannes Schindelin2017-01-196-97/+47
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | difftool: implement the functionality in the builtinJohannes Schindelin2017-01-191-1/+671
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | difftool: add a skeleton for the upcoming builtinJohannes Schindelin2017-01-177-1/+75
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/qsort-s'Junio C Hamano2017-01-317-12/+146
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref-filter: use QSORT_S in ref_array_sort()René Scharfe2017-01-231-4/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | string-list: use QSORT_S in string_list_sort()René Scharfe2017-01-231-8/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | perf: add basic sort performance testRené Scharfe2017-01-232-0/+51
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add QSORT_SRené Scharfe2017-01-231-0/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compat: add qsort_s()René Scharfe2017-01-233-0/+83
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ls/travis-p4-on-macos'Junio C Hamano2017-01-311-10/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | travis-ci: fix Perforce install on macOSls/travis-p4-on-macosLars Schneider2017-01-231-10/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'vp/show-ref-verify-head'Junio C Hamano2017-01-312-28/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show-ref: remove a stale commentvp/show-ref-verify-headJunio C Hamano2017-01-231-4/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show-ref: remove dead `if (verify)' checkVladimir Panteleev2017-01-231-3/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show-ref: detect dangling refs under --verify as wellVladimir Panteleev2017-01-232-8/+30
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show-ref: move --quiet handling into show_one()Vladimir Panteleev2017-01-231-5/+4