summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-06-05Merge branch 'jk/add-e-kill-editor' into maintLibravatar Junio C Hamano2-1/+9
2015-06-05Merge branch 'mh/clone-verbosity-fix' into maintLibravatar Junio C Hamano1-2/+2
2015-06-05Merge branch 'jk/sha1-file-reduce-useless-warnings' into maintLibravatar Junio C Hamano2-6/+2
2015-06-05Merge branch 'tb/blame-resurrect-convert-to-git' into maintLibravatar Junio C Hamano2-3/+16
2015-06-05Merge branch 'jc/plug-fmt-merge-msg-leak' into maintLibravatar Junio C Hamano1-5/+11
2015-06-05Merge branch 'pt/xdg-config-path' into maintLibravatar Junio C Hamano10-81/+243
2015-06-04ll-merge: pass the original path to external driversLibravatar Junio C Hamano3-8/+21
2015-06-04git-am: add am.threeWay config variableLibravatar Remi Lespinet4-2/+41
2015-06-04t4150-am: refactor am -3 testsLibravatar Remi Lespinet1-15/+11
2015-06-04git-am.sh: fix initialization of the threeway variableLibravatar Remi Lespinet1-0/+1
2015-06-04index-pack: fix truncation of off_t in comparisonLibravatar Jeff King1-2/+6
2015-06-03read_loose_refs(): simplify function logicLibravatar Michael Haggerty1-7/+12
2015-06-03configure: add getdelim() checkLibravatar Eric Sunshine1-0/+6
2015-06-03config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releasesLibravatar Eric Sunshine1-0/+3
2015-06-03ewah: use less generic macro nameLibravatar Jeff King4-23/+23
2015-06-03ewah/bitmap: silence warning about MASK macro redefinitionLibravatar Eric Sunshine1-8/+8
2015-06-02Documentation/technical/pack-protocol: mention http as possible protocolLibravatar Stefan Beller1-3/+3
2015-06-02pull: use git-rev-parse --parseopt for option parsingLibravatar Paul Tan1-40/+57
2015-06-02pull: handle git-fetch's options as wellLibravatar Paul Tan4-6/+68
2015-06-02Merge branch 'pt/pull-tests' into pt/pull-optparseLibravatar Junio C Hamano2-36/+175
2015-06-02for-each-ref: report broken references correctlyLibravatar Michael Haggerty2-1/+6
2015-06-02t6301: new tests of for-each-ref error handlingLibravatar Michael Haggerty1-0/+56
2015-06-01format-patch: do not feed tags to clear_commit_marks()Libravatar Junio C Hamano2-6/+14
2015-06-01send-email: further warn about unsupported sendmail aliases featuresLibravatar Eric Sunshine1-0/+4
2015-06-01t9001: add sendmail aliases line continuation testsLibravatar Eric Sunshine1-0/+34
2015-06-01t9001: refactor sendmail aliases test infrastructureLibravatar Eric Sunshine1-18/+29
2015-06-01send-email: implement sendmail aliases line continuation supportLibravatar Eric Sunshine2-5/+7
2015-06-01send-email: simplify sendmail aliases comment and blank line recognizerLibravatar Eric Sunshine1-1/+1
2015-06-01send-email: refactor sendmail aliases parserLibravatar Eric Sunshine1-14/+24
2015-06-01send-email: fix style: cuddle 'elsif' and 'else' with closing braceLibravatar Eric Sunshine1-12/+5
2015-06-01send-email: drop noise comments which merely repeat what code saysLibravatar Eric Sunshine1-5/+0
2015-06-01send-email: visually distinguish sendmail aliases parser warningsLibravatar Eric Sunshine1-3/+3
2015-06-01send-email: further document missing sendmail aliases functionalityLibravatar Eric Sunshine1-0/+3
2015-06-01blame: add blame.showEmail configurationLibravatar Quentin Neill3-1/+73
2015-06-01Sixth batch for 2.5 cycleLibravatar Junio C Hamano1-1/+50
2015-06-01Merge branch 'sb/test-bitmap-free-at-end'Libravatar Junio C Hamano1-1/+1
2015-06-01Merge branch 'mm/rebase-i-post-rewrite-exec'Libravatar Junio C Hamano2-41/+58
2015-06-01Merge branch 'fm/fetch-raw-sha1'Libravatar Junio C Hamano6-16/+116
2015-06-01Merge branch 'sg/help-group'Libravatar Junio C Hamano7-51/+117
2015-06-01Merge branch 'mm/log-format-raw-doc'Libravatar Junio C Hamano2-2/+14
2015-06-01Merge branch 'dt/cat-file-follow-symlinks'Libravatar Junio C Hamano7-19/+601
2015-06-01Merge branch 'rs/janitorial'Libravatar Junio C Hamano7-26/+9
2015-06-01Merge branch 'jk/stash-options'Libravatar Junio C Hamano2-1/+20
2015-06-01Merge branch 'da/mergetool-winmerge'Libravatar Junio C Hamano3-2/+39
2015-06-01Merge branch 'mc/commit-doc-grammofix'Libravatar Junio C Hamano1-1/+1
2015-06-01Merge branch 'jh/filter-empty-contents'Libravatar Junio C Hamano2-1/+27
2015-06-01Merge branch 'ah/usage-strings'Libravatar Junio C Hamano2-2/+2
2015-06-01Merge branch 'jk/http-backend-deadlock'Libravatar Junio C Hamano3-29/+139
2015-06-01Merge branch 'dt/clean-pathspec-filter-then-lstat'Libravatar Junio C Hamano1-3/+3
2015-06-01apply: reject a hunk that does not do anythingLibravatar Junio C Hamano2-0/+16