summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2013-03-25Merge branch 'jk/suppress-clang-warning'Libravatar Junio C Hamano2-2/+4
2013-03-25Merge branch 'pw/p4-symlinked-root'Libravatar Junio C Hamano2-7/+63
2013-03-25Merge branch 'jk/empty-archive'Libravatar Junio C Hamano6-13/+109
2013-03-25Merge branch 'ks/rfc2047-one-char-at-a-time'Libravatar Junio C Hamano4-25/+77
2013-03-25Merge branch 'jk/alias-in-bare'Libravatar Junio C Hamano5-12/+53
2013-03-25Merge branch 'jc/push-follow-tag'Libravatar Junio C Hamano9-14/+218
2013-03-25Merge branch 'jc/maint-reflog-expire-clean-mark-typofix'Libravatar Junio C Hamano1-1/+1
2013-03-25Merge branch 'ap/maint-diff-rename-avoid-overlap'Libravatar Junio C Hamano2-1/+67
2013-03-25Merge branch 'jl/submodule-deinit'Libravatar Junio C Hamano5-3/+198
2013-03-25Merge branch 'jc/describe'Libravatar Junio C Hamano1-21/+20
2013-03-25Merge branch 'pe/pull-rebase-v-q'Libravatar Junio C Hamano2-1/+28
2013-03-25Merge branch 'maint'Libravatar Junio C Hamano2-1/+31
2013-03-25Start preparing for 1.8.2.1Libravatar Junio C Hamano2-1/+30
2013-03-25Merge branch 'jk/graph-c-expose-symbols-for-cgit' into maintLibravatar Junio C Hamano2-30/+35
2013-03-25Merge branch 'maint-1.8.1' into maintLibravatar Junio C Hamano10-23/+64
2013-03-25Merge branch 'lf/bundle-verify-list-prereqs' into maint-1.8.1Libravatar Junio C Hamano1-5/+5
2013-03-25Merge branch 'tk/doc-filter-branch' into maint-1.8.1Libravatar Junio C Hamano1-2/+25
2013-03-25Merge branch 'dm/ni-maxhost-may-be-missing' into maint-1.8.1Libravatar Junio C Hamano2-4/+11
2013-03-25Merge branch 'gp/describe-match-uses-glob-pattern' into maint-1.8.1Libravatar Junio C Hamano1-2/+3
2013-03-25Merge branch 'nd/doc-index-format' into maint-1.8.1Libravatar Junio C Hamano3-5/+13
2013-03-25Merge branch 'wk/doc-pre-rebase' into maint-1.8.1Libravatar Junio C Hamano1-3/+5
2013-03-25Merge branch 'jc/color-diff-doc' into maint-1.8.1Libravatar Junio C Hamano1-2/+2
2013-03-25merge-one-file: force content conflict for "both sides added" caseLibravatar Junio C Hamano1-5/+2
2013-03-25transport.c: help gcc 4.6.3 users by squelching compiler warningLibravatar Junio C Hamano1-1/+2
2013-03-25git-merge-one-file: send "ERROR:" messages to stderrLibravatar Kevin Bracey1-7/+7
2013-03-25git-merge-one-file: style cleanupLibravatar Kevin Bracey1-9/+17
2013-03-25merge-one-file: remove stale commentLibravatar Junio C Hamano1-2/+0
2013-03-25t7600: use test_config to set/unset git config variablesLibravatar Yann Droneaud1-34/+26
2013-03-25t7502: remove clear_configLibravatar Yann Droneaud1-26/+6
2013-03-25t7502: use test_config to set/unset git config variablesLibravatar Yann Droneaud1-5/+3
2013-03-25t9500: use test_config to set/unset git config variablesLibravatar Yann Droneaud1-2/+1
2013-03-25t7508: use test_config to set/unset git config variablesLibravatar Yann Droneaud1-30/+16
2013-03-25t7500: use test_config to set/unset git config variablesLibravatar Yann Droneaud1-4/+2
2013-03-25t5541: use test_config to set/unset git config variablesLibravatar Yann Droneaud1-2/+1
2013-03-25t5520: use test_config to set/unset git config variablesLibravatar Yann Droneaud1-8/+4
2013-03-25t4202: use test_config/test_unconfig to set/unset git config variablesLibravatar Yann Droneaud1-20/+8
2013-03-25t4034: use test_config/test_unconfig to set/unset git config variablesLibravatar Yann Droneaud1-4/+3
2013-03-25t4304: use test_config to set/unset git config variablesLibravatar Yann Droneaud1-2/+1
2013-03-25t3400: use test_config to set/unset git config variablesLibravatar Yann Droneaud1-2/+1
2013-03-23refs.c: fix fread error handlingLibravatar John Keeping1-1/+1
2013-03-22Fix revision walk for commits with the same datesLibravatar Kacper Kornet2-1/+14
2013-03-21Documentation: merging a tag is a special caseLibravatar Junio C Hamano2-1/+26
2013-03-21Update draft release notes to 1.8.3Libravatar Junio C Hamano1-0/+76
2013-03-21CodingGuidelines: our documents are in AsciiDocLibravatar Junio C Hamano1-0/+3
2013-03-21Merge branch 'maint'Libravatar Junio C Hamano6-14/+17
2013-03-21diff.c: diff.renamelimit => diff.renameLimit in messageLibravatar Max Nanasy1-1/+1
2013-03-21wt-status: fix possible use of uninitialized variableLibravatar Jeff King1-1/+4
2013-03-21fast-import: clarify "inline" logic in file_change_mLibravatar Jeff King1-1/+2
2013-03-21run-command: always set failed_errno in start_commandLibravatar Jeff King1-2/+3
2013-03-21transport: drop "int cmp = cmp" hackLibravatar Jeff King1-1/+1