summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-05-23refactor get_textconv to not require diff_filespecLibravatar Jeff King3-13/+20
2011-05-23combine-diff: handle binary files as binaryLibravatar Jeff King2-2/+148
2011-05-23combine-diff: calculate mode_differs earlierLibravatar Jeff King1-2/+7
2011-05-23combine-diff: split header printing into its own functionLibravatar Jeff King1-61/+74
2011-05-20Merge branch 'maint'Libravatar Junio C Hamano2-1/+16
2011-05-20git-svn: Fix git svn log --show-commitLibravatar Michael J Gruber2-1/+16
2011-05-19Update draft release notes to 1.7.6Libravatar Junio C Hamano1-1/+22
2011-05-19Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'Libravatar Junio C Hamano0-0/+0
2011-05-19Merge branch 'rg/copy-gecos-username'Libravatar Junio C Hamano1-0/+1
2011-05-19Merge branch 'jl/submodule-conflicted-gitmodules'Libravatar Junio C Hamano2-6/+117
2011-05-19Merge branch 'jc/replacing'Libravatar Junio C Hamano8-23/+45
2011-05-19Merge branch 'nd/sparse-co-fix'Libravatar Junio C Hamano2-33/+83
2011-05-19Merge branch 'ld/p4-preserve-user-names'Libravatar Junio C Hamano3-38/+340
2011-05-19Merge branch 'ms/tagname-does-not-begin-with-dash'Libravatar Junio C Hamano1-8/+18
2011-05-19Merge branch 'jk/git-connection-deadlock-fix'Libravatar Junio C Hamano4-14/+67
2011-05-19Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Libravatar Junio C Hamano1-2/+2
2011-05-19Merge branch 'jk/cherry-pick-root-with-resolve'Libravatar Junio C Hamano3-7/+36
2011-05-19Merge branch 'jc/maint-pathspec-stdin-and-cmdline'Libravatar Junio C Hamano2-52/+45
2011-05-19Merge 1.7.5.2 inLibravatar Junio C Hamano2-1/+513
2011-05-19Revert "Merge branch 'en/merge-recursive'"Libravatar Junio C Hamano2-81/+6
2011-05-19Git 1.7.5.2Libravatar Junio C Hamano2-2/+3
2011-05-19Makefile: sort TEST_PROGRAMS listLibravatar Jeff King1-2/+2
2011-05-19provide a copy of the LGPLv2.1Libravatar Jonathan Nieder1-0/+511
2011-05-18test core.gitproxy configurationLibravatar Jeff King1-0/+43
2011-05-17copy_gecos: fix not adding nlen to len when processing "&"Libravatar Rafael Gieschke1-0/+1
2011-05-16Update release notes to 1.7.6Libravatar Junio C Hamano1-13/+20
2011-05-16Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Libravatar Junio C Hamano1-2/+2
2011-05-16Merge branch 'jc/convert'Libravatar Junio C Hamano4-90/+84
2011-05-16Merge branch 'ci/commit--interactive-atomic'Libravatar Junio C Hamano6-31/+75
2011-05-16Merge branch 'sg/completion-updates'Libravatar Junio C Hamano1-4/+16
2011-05-16Merge branch 'kk/maint-prefix-in-config-mak'Libravatar Junio C Hamano1-9/+9
2011-05-16Merge branch 'mg/merge-ff-config'Libravatar Junio C Hamano3-6/+77
2011-05-16Merge branch 'maint'Libravatar Junio C Hamano2-2/+17
2011-05-16Update draft release notes to 1.7.5.2Libravatar Junio C Hamano1-0/+15
2011-05-16Merge branch 'jn/maint-format-patch-doc' into maintLibravatar Junio C Hamano1-0/+58
2011-05-16Merge branch 'ss/cherry-pick-x-doc' into maintLibravatar Junio C Hamano1-3/+4
2011-05-16Merge branch 'vr/merge-base-doc' into maintLibravatar Junio C Hamano2-14/+23
2011-05-16Merge branch 'sr/maint-fast-import-tighten-option-parsing' into maintLibravatar Junio C Hamano1-3/+3
2011-05-16Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maintLibravatar Junio C Hamano1-2/+5
2011-05-16Merge branch 'jc/fix-add-u-unmerged' into maintLibravatar Junio C Hamano2-39/+30
2011-05-16Merge branch 'jn/gitweb-dependency' into maintLibravatar Junio C Hamano1-27/+1
2011-05-16Merge branch 'jc/maint-branch-mergeoptions' into maintLibravatar Junio C Hamano2-15/+58
2011-05-16Merge branch 'jc/maint-add-p-overlapping-hunks' into maintLibravatar Junio C Hamano3-16/+54
2011-05-16Documentation/git-fsck.txt: fix typo: unreadable -> unreachableLibravatar Jim Meyering1-2/+2
2011-05-16send-pack: avoid deadlock on git:// push with failed pack-objectsLibravatar Jeff King1-0/+2
2011-05-16connect: let callers know if connection is a socketLibravatar Jeff King2-1/+7
2011-05-16connect: treat generic proxy processes like ssh processesLibravatar Jeff King1-13/+15
2011-05-16sideband_demux(): fix decl-after-stmtLibravatar Junio C Hamano1-2/+2
2011-05-16t3503: test cherry picking and reverting root commitsLibravatar Jeff King1-2/+25
2011-05-16revert: allow reverting a root commitLibravatar Jeff King1-3/+1