summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-04-14Merge branch 'da/mergetool-delete-delete-conflict' into maintLibravatar Junio C Hamano2-4/+85
2016-04-14Merge branch 'jk/startup-info' into maintLibravatar Junio C Hamano13-26/+54
2016-04-14Merge branch 'jk/getwholeline-getdelim-empty' into maintLibravatar Junio C Hamano2-1/+11
2016-04-14Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maintLibravatar Junio C Hamano1-1/+2
2016-04-14Merge branch 'gf/fetch-pack-direct-object-fetch' into maintLibravatar Junio C Hamano3-3/+31
2016-04-14Merge branch 'jk/rev-parse-local-env-vars' into maintLibravatar Junio C Hamano2-18/+77
2016-04-14Merge branch 'jk/config-get-urlmatch' into maintLibravatar Junio C Hamano3-11/+16
2016-04-14Merge branch 'pb/t7502-drop-dup' into maintLibravatar Junio C Hamano1-5/+0
2016-04-14Merge branch 'jk/test-httpd-config-nosystem' into maintLibravatar Junio C Hamano1-0/+1
2016-04-14Merge branch 'sb/clone-t57-t56' into maintLibravatar Junio C Hamano10-0/+0
2016-04-14Merge branch 'jk/credential-cache-comment-exit' into maintLibravatar Junio C Hamano1-1/+10
2016-04-14Merge branch 'jc/index-pack' into maintLibravatar Junio C Hamano2-18/+23
2016-04-14Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maintLibravatar Junio C Hamano3-9/+9
2016-04-14Merge branch 'mp/upload-pack-use-embedded-args' into maintLibravatar Junio C Hamano1-14/+11
2016-04-14Merge branch 'oa/doc-diff-check' into maintLibravatar Junio C Hamano1-2/+2
2016-04-14Merge branch 'pb/opt-cmdmode-doc' into maintLibravatar Junio C Hamano1-0/+7
2016-04-14Merge branch 'nd/apply-doc' into maintLibravatar Junio C Hamano1-1/+3
2016-04-14Merge branch 'cc/doc-recommend-performance-trace-to-file' into maintLibravatar Junio C Hamano1-0/+43
2016-04-14Merge branch 'mm/lockfile-error-message' into maintLibravatar Junio C Hamano1-5/+7
2016-04-13Start preparing for 2.8.2Libravatar Junio C Hamano1-0/+17
2016-04-13imap-send: fix CRAM-MD5 response calculationLibravatar Kazuki Yamaguchi1-1/+1
2016-04-13imap-send: check for NOLOGIN capability only when using LOGIN commandLibravatar Kazuki Yamaguchi1-5/+5
2016-04-13Fourth batch for post 2.8 cycleLibravatar Junio C Hamano1-2/+65
2016-04-13Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'Libravatar Junio C Hamano2-0/+15
2016-04-13Merge branch 'mg/complete-cherry-mark-to-log'Libravatar Junio C Hamano1-0/+1
2016-04-13Merge branch 'ep/trace-doc-sample-fix'Libravatar Junio C Hamano1-1/+1
2016-04-13Merge branch 'jc/makefile-redirection-stderr'Libravatar Junio C Hamano1-2/+2
2016-04-13Merge branch 'lt/pretty-expand-tabs'Libravatar Junio C Hamano9-10/+220
2016-04-13Merge branch 'mj/pull-rebase-autostash'Libravatar Junio C Hamano3-10/+103
2016-04-13Merge branch 'jn/mergetools-examdiff'Libravatar Junio C Hamano3-20/+44
2016-04-13Merge branch 'es/format-patch-doc-hide-no-patch'Libravatar Junio C Hamano1-1/+1
2016-04-13Merge branch 'js/mingw-tests-2.8'Libravatar Junio C Hamano2-11/+3
2016-04-13Merge branch 'cc/apply'Libravatar Junio C Hamano1-15/+15
2016-04-13Merge branch 'sb/misc-cleanups'Libravatar Junio C Hamano4-11/+22
2016-04-13Merge branch 'sk/send-pack-all-fix'Libravatar Junio C Hamano2-1/+13
2016-04-13Merge branch 'sg/diff-multiple-identical-renames'Libravatar Junio C Hamano2-2/+15
2016-04-13Merge branch 'kn/for-each-tag-branch'Libravatar Junio C Hamano1-1/+1
2016-04-13Merge branch 'ky/branch-d-worktree'Libravatar Junio C Hamano2-8/+20
2016-04-13Merge branch 'rz/worktree-no-checkout'Libravatar Junio C Hamano3-12/+37
2016-04-13Merge branch 'rt/rebase-i-shorten-stop-report'Libravatar Junio C Hamano1-1/+2
2016-04-13Merge branch 'rt/completion-help'Libravatar Junio C Hamano1-3/+3
2016-04-13Merge branch 'ak/use-hashmap-iter-first-in-submodule-config'Libravatar Junio C Hamano1-2/+1
2016-04-13Merge branch 'jk/check-repository-format'Libravatar Junio C Hamano7-114/+167
2016-04-12merge-octopus: abort if index does not match HEADLibravatar Elijah Newren2-3/+9
2016-04-12t6044: new merge testcases for when index doesn't match HEADLibravatar Elijah Newren1-0/+153
2016-04-12builtin/merge.c: fix a bug with trivial mergesLibravatar Elijah Newren2-1/+9
2016-04-12t7605: add a testcase demonstrating a bug with trivial mergesLibravatar Elijah Newren1-1/+5
2016-04-12t3404: use write_scriptLibravatar Junio C Hamano1-4/+3
2016-04-11t1020: do not overuse printf and use write_scriptLibravatar Junio C Hamano1-5/+5
2016-04-10t5532: use write_scriptLibravatar Jeff King1-9/+12