summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2017-03-20Merge branch 'js/difftool-builtin'Libravatar Junio C Hamano2-7/+111
2017-03-17Fifth batch for 2.13Libravatar Junio C Hamano1-9/+54
2017-03-17Merge branch 'jk/cherry-pick-0-mainline'Libravatar Junio C Hamano2-1/+29
2017-03-17Merge branch 'js/early-config'Libravatar Junio C Hamano7-111/+313
2017-03-17Merge branch 'bc/sha1-header-selection-with-cpp-macros'Libravatar Junio C Hamano3-8/+20
2017-03-17Merge branch 'mg/status-porcelain-no-i18n'Libravatar Junio C Hamano1-4/+4
2017-03-17Merge branch 'jk/add-i-use-pathspecs'Libravatar Junio C Hamano2-11/+45
2017-03-17Merge branch 'jk/http-walker-buffer-underflow-fix'Libravatar Junio C Hamano1-4/+7
2017-03-17Merge branch 'bw/attr-pathspec'Libravatar Junio C Hamano7-10/+446
2017-03-17Merge branch 'jk/ref-filter-flags-cleanup'Libravatar Junio C Hamano2-31/+44
2017-03-17Merge branch 'sb/rev-parse-show-superproject-root'Libravatar Junio C Hamano5-0/+117
2017-03-17Merge branch 'bc/object-id'Libravatar Junio C Hamano33-462/+494
2017-03-17Merge branch 'rs/blame-code-cleanup'Libravatar Junio C Hamano1-17/+8
2017-03-17Merge branch 'jk/interop-test'Libravatar Junio C Hamano8-1/+270
2017-03-17Merge branch 'cc/split-index-config'Libravatar Junio C Hamano11-131/+540
2017-03-16Sync with 'maint'Libravatar Junio C Hamano1-0/+41
2017-03-16Preparing for 2.12.1Libravatar Junio C Hamano3-2/+43
2017-03-16Merge branch 'js/realpath-pathdup-fix' into maintLibravatar Junio C Hamano10-18/+26
2017-03-16Merge branch 'mm/two-more-xstrfmt' into maintLibravatar Junio C Hamano2-11/+9
2017-03-16Merge branch 'vn/line-log-memcpy-size-fix' into maintLibravatar Junio C Hamano1-1/+2
2017-03-16Merge branch 'ax/line-log-range-merge-fix' into maintLibravatar Junio C Hamano2-8/+17
2017-03-16Merge branch 'jk/add-i-patch-do-prompt' into maintLibravatar Junio C Hamano2-4/+22
2017-03-16Merge branch 'jt/http-base-url-update-upon-redirect' into maintLibravatar Junio C Hamano3-0/+21
2017-03-16Merge branch 'js/travis-32bit-linux' into maintLibravatar Junio C Hamano2-0/+51
2017-03-16Merge branch 'jh/mingw-openssl-sha1' into maintLibravatar Junio C Hamano1-1/+0
2017-03-16Merge branch 'jk/http-auth' into maintLibravatar Junio C Hamano1-4/+46
2017-03-15cherry-pick: detect bogus arguments to --mainlineLibravatar Jeff King2-1/+29
2017-03-15difftool: handle modified symlinks in dir-diff modeLibravatar David Aguilar2-5/+106
2017-03-15t7800: cleanup cruft left behind by testsLibravatar David Aguilar1-1/+4
2017-03-15t7800: remove whitespace before redirectLibravatar David Aguilar1-1/+1
2017-03-15hash.h: move SHA-1 implementation selection into a header fileLibravatar brian m. carlson3-8/+20
2017-03-14Fourth batch after 2.12Libravatar Junio C Hamano1-0/+42
2017-03-14Merge branch 'kn/ref-filter-branch-list'Libravatar Junio C Hamano2-4/+40
2017-03-14Merge branch 'jk/push-deadlock-regression-fix'Libravatar Junio C Hamano2-11/+40
2017-03-14Merge branch 'js/travis-32bit-linux'Libravatar Junio C Hamano2-0/+51
2017-03-14Merge branch 'ew/http-alternates-as-redirects-warning'Libravatar Junio C Hamano1-3/+7
2017-03-14Merge branch 'dp/filter-branch-prune-empty'Libravatar Junio C Hamano4-8/+50
2017-03-14Merge branch 'jt/perf-updates'Libravatar Junio C Hamano3-3/+7
2017-03-14Merge branch 'mm/fetch-show-error-message-on-unadvertised-object'Libravatar Junio C Hamano7-30/+66
2017-03-14Merge branch 'jk/interpret-branch-name'Libravatar Junio C Hamano10-51/+249
2017-03-14Merge branch 'ab/cond-skip-tests'Libravatar Junio C Hamano3-1/+16
2017-03-14setup.c: mention unresolved problemsLibravatar Johannes Schindelin1-0/+2
2017-03-14t1309: document cases where we would want early config not to die()Libravatar Johannes Schindelin1-0/+24
2017-03-14setup_git_directory_gently_1(): avoid die()ingLibravatar Johannes Schindelin1-8/+17
2017-03-14t1309: test read_early_config()Libravatar Johannes Schindelin2-0/+65
2017-03-14read_early_config(): really discover .git/Libravatar Johannes Schindelin2-23/+16
2017-03-14read_early_config(): avoid .git/config hack when unneededLibravatar Johannes Schindelin1-2/+3
2017-03-14setup: make read_early_config() reusableLibravatar Johannes Schindelin3-31/+32
2017-03-14setup: introduce the discover_git_directory() functionLibravatar Johannes Schindelin2-0/+50
2017-03-14setup_git_directory_1(): avoid changing global stateLibravatar Johannes Schindelin1-75/+118