summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2017-03-21Merge branch 'js/rebase-helper'Libravatar Junio C Hamano1-1/+2
2017-03-21Merge branch 'nd/conditional-config-include'Libravatar Junio C Hamano3-8/+218
2017-03-21Merge branch 'jk/pack-name-cleanups'Libravatar Junio C Hamano6-46/+57
2017-03-21Merge branch 'sb/submodule-config-parse-ignore-fix'Libravatar Junio C Hamano1-1/+1
2017-03-21Merge branch 'mg/prompt-describe-tags'Libravatar Junio C Hamano1-0/+3
2017-03-21Merge branch 'jk/rev-parse-cleanup'Libravatar Junio C Hamano1-52/+57
2017-03-20Sync with 2.12.1Libravatar Junio C Hamano1-1/+2
2017-03-20Merge branch 'js/difftool-builtin'Libravatar Junio C Hamano2-7/+111
2017-03-20Git 2.12.1Libravatar Junio C Hamano1-1/+2
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-17sequencer: drop "warning:" when stopping for editLibravatar Jeff King1-1/+2
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