summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2017-03-16sha1dc: adjust header includes for gitLibravatar Jeff King4-13/+9
2017-03-16sha1dc: add collision-detecting sha1 implementationLibravatar Jeff King5-0/+2336
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-16index-pack: make pointer-alias fallbacks saferLibravatar Jeff King1-8/+12
2017-03-16replace snprintf with odb_pack_name()Libravatar Jeff King2-31/+24
2017-03-16odb_pack_keep(): stop generating keepfile nameLibravatar Jeff King4-12/+12
2017-03-16sha1_file.c: make pack-name helper globally accessibleLibravatar Jeff King2-11/+15
2017-03-16move odb_* declarations out of git-compat-util.hLibravatar Jeff King2-2/+12
2017-03-15rev-parse: simplify parsing of ref optionsLibravatar Jeff King1-29/+16
2017-03-15rev-parse: add helper for parsing "--foo/--foo="Libravatar Jeff King1-10/+28
2017-03-15rev-parse: use skip_prefix when parsing optionsLibravatar Jeff King1-20/+20
2017-03-15git-prompt: add a describe style for any tagsLibravatar Michael J Gruber1-0/+3
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-15submodule-config: correct error reporting for invalid ignore valueLibravatar Stefan Beller1-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
2017-03-14setup: prepare setup_discovered_git_dir() for the root directoryLibravatar Johannes Schindelin1-2/+4
2017-03-14add--interactive: do not expand pathspecs with ls-filesLibravatar Jeff King2-11/+45
2017-03-14git-status: make porcelain more robustLibravatar Michael J Gruber1-4/+4