summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-06-18pull: check if in unresolved merge stateLibravatar Paul Tan3-0/+18
2015-06-18pull: support pull.ff configLibravatar Paul Tan1-0/+29
2015-06-18pull: error on no merge candidatesLibravatar Paul Tan1-0/+113
2015-06-18pull: pass git-fetch's options to git-fetchLibravatar Paul Tan1-0/+95
2015-06-15pull: pass git-merge's options to git-mergeLibravatar Paul Tan1-0/+75
2015-06-15pull: pass verbosity, --progress flags to fetch and mergeLibravatar Paul Tan1-0/+36
2015-06-15pull: implement fetch + mergeLibravatar Paul Tan1-1/+61
2015-06-15pull: implement skeletal builtin pullLibravatar Paul Tan4-0/+36
2015-06-15argv-array: implement argv_array_pushv()Libravatar Paul Tan3-0/+10
2015-06-15parse-options-cb: implement parse_opt_passthru_argv()Libravatar Paul Tan3-0/+29
2015-06-15parse-options-cb: implement parse_opt_passthru()Libravatar Paul Tan3-0/+59
2015-06-05Sync with 2.4.3Libravatar Junio C Hamano2-1/+78
2015-06-05Git 2.4.3Libravatar Junio C Hamano4-3/+80
2015-06-05The first half of the seventh batch for 2.5Libravatar Junio C Hamano1-0/+14
2015-06-05Merge branch 'ld/p4-editor-multi-words'Libravatar Junio C Hamano5-7/+47
2015-06-05Merge branch 'bc/object-id'Libravatar Junio C Hamano36-255/+300
2015-06-05Merge branch 'jk/at-push-sha1'Libravatar Junio C Hamano14-149/+424
2015-06-05Merge branch 'dl/branch-error-message' into maintLibravatar Junio C Hamano1-3/+3
2015-06-05Merge branch 'jk/skip-http-tests-under-no-curl' into maintLibravatar Junio C Hamano8-35/+13
2015-06-05Merge branch 'ps/doc-packfile-vs-pack-file' into maintLibravatar Junio C Hamano3-9/+9
2015-06-05Merge branch 'fg/document-commit-message-stripping' into maintLibravatar Junio C Hamano1-4/+7
2015-06-05Merge branch 'jk/rerere-forget-check-enabled' into maintLibravatar Junio C Hamano1-0/+2
2015-06-05Merge branch 'pt/pull-log-n' into maintLibravatar Junio C Hamano2-2/+19
2015-06-05Merge branch 'pt/pull-ff-vs-merge-ff' into maintLibravatar Junio C Hamano3-2/+13
2015-06-05Merge branch 'rs/plug-leak-in-pack-bitmaps' into maintLibravatar Junio C Hamano1-5/+3
2015-06-05Merge branch 'ja/tutorial-asciidoctor-fix' into maintLibravatar Junio C Hamano1-1/+1
2015-06-05Merge branch 'jk/stripspace-asciidoctor-fix' into maintLibravatar Junio C Hamano1-3/+3
2015-06-05Merge branch 'jk/asciidoc-markup-fix' into maintLibravatar Junio C Hamano19-102/+107
2015-06-05Merge branch 'ps/bundle-verify-arg' into maintLibravatar Junio C Hamano1-0/+8
2015-06-05Merge branch 'mh/write-refs-sooner-2.4' into maintLibravatar Junio C Hamano3-33/+112
2015-06-05Merge branch 'mh/ref-directory-file' into maintLibravatar Junio C Hamano3-118/+312
2015-06-05Merge branch 'mg/log-decorate-HEAD' into maintLibravatar Junio C Hamano2-11/+22
2015-06-05Merge branch 'sb/t1020-cleanup' into maintLibravatar Junio C Hamano1-4/+7
2015-06-05Merge branch 'jc/gitignore-precedence' into maintLibravatar Junio C Hamano2-3/+17
2015-06-05Merge branch 'bc/connect-plink' into maintLibravatar Junio C Hamano2-22/+67
2015-06-05Merge branch 'ph/rebase-i-redo' into maintLibravatar Junio C Hamano2-0/+63
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-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