summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-08Third batch for post 2.8 cycleLibravatar Junio C Hamano1-0/+24
2016-04-08Merge branch 'ss/msvc'Libravatar Junio C Hamano3-2/+6
2016-04-08Merge branch 'oa/doc-diff-check'Libravatar Junio C Hamano1-2/+2
2016-04-08Merge branch 'pb/opt-cmdmode-doc'Libravatar Junio C Hamano1-0/+7
2016-04-08Merge branch 'nd/apply-report-skip'Libravatar Junio C Hamano1-0/+2
2016-04-08Merge branch 'nd/apply-doc'Libravatar Junio C Hamano1-1/+3
2016-04-08Merge branch 'jc/merge-refuse-new-root'Libravatar Junio C Hamano12-14/+57
2016-04-06Second batch for post 2.8 cycleLibravatar Junio C Hamano2-2/+51
2016-04-06Merge branch 'la/tag-force-signing-annotated-tags'Libravatar Junio C Hamano3-6/+60
2016-04-06Merge branch 'jk/submodule-c-credential'Libravatar Junio C Hamano8-19/+172
2016-04-06Merge branch 'jv/merge-nothing-into-void'Libravatar Junio C Hamano2-5/+15
2016-04-06Merge branch 'ss/commit-squash-msg'Libravatar Junio C Hamano2-1/+38
2016-04-06Merge branch 'sb/rebase-x'Libravatar Junio C Hamano3-22/+10
2016-04-06Merge branch 'jk/test-httpd-config-nosystem'Libravatar Junio C Hamano1-0/+1
2016-04-06Merge branch 'jk/send-email-rtrim-mailrc-alias'Libravatar Junio C Hamano1-1/+1
2016-04-06Merge branch 'jk/credential-cache-comment-exit'Libravatar Junio C Hamano1-1/+10
2016-04-06Merge branch 'sb/clone-t57-t56'Libravatar Junio C Hamano10-0/+0
2016-04-06Merge branch 'ls/p4-map-user'Libravatar Junio C Hamano3-0/+81
2016-04-06Merge branch 'cc/doc-recommend-performance-trace-to-file'Libravatar Junio C Hamano1-0/+43
2016-04-06Merge branch 'pb/t7502-drop-dup'Libravatar Junio C Hamano1-5/+0
2016-04-06Merge branch 'da/mergetool-delete-delete-conflict'Libravatar Junio C Hamano2-4/+85
2016-04-06Merge branch 'sb/submodule-parallel-update'Libravatar Junio C Hamano18-62/+445
2016-04-06Merge branch 'ss/receive-pack-parse-options'Libravatar Junio C Hamano1-33/+20
2016-04-06Merge branch 'ss/exc-flag-is-a-collection-of-bits'Libravatar Junio C Hamano3-9/+9
2016-04-04Windows: shorten code by re-using convert_slashes()Libravatar Johannes Sixt2-11/+3
2016-04-04git-format-patch.txt: don't show -s as shorthand for multiple optionsLibravatar Eric Sunshine1-1/+1
2016-04-04t5520: test --[no-]autostash with pull.rebase=trueLibravatar Mehul Jain1-0/+10
2016-04-04t5520: reduce commom lines of codeLibravatar Mehul Jain1-9/+7
2016-04-04t5520: factor out common "failing autostash" codeLibravatar Mehul Jain1-15/+11
2016-04-04t5520: factor out common "successful autostash" codeLibravatar Mehul Jain1-29/+15
2016-04-04t5520: use better test to check stderr outputLibravatar Mehul Jain1-6/+4
2016-04-04t5520: ensure consistent test conditionsLibravatar Mehul Jain1-0/+2
2016-04-04t5520: use consistent capitalization in test titlesLibravatar Mehul Jain1-2/+2
2016-04-04mergetools: add support for ExamDiffLibravatar Jacob Nisnevich1-0/+18
2016-04-04mergetools: create mergetool_find_win32_cmd() helper function for winmergeLibravatar Jacob Nisnevich2-20/+26