summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-05-13Merge branch 'rr/rerere-libify-clear-gc'Libravatar Junio C Hamano3-75/+88
2011-05-13Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Libravatar Junio C Hamano1-0/+5
2011-05-13Merge branch 'jh/dirstat-lines'Libravatar Junio C Hamano5-32/+1219
2011-05-13Merge branch 'jc/fix-add-u-unmerged'Libravatar Junio C Hamano2-39/+30
2011-05-13Merge branch 'jn/setup-revisions-glob-and-friends-passthru'Libravatar Junio C Hamano2-65/+122
2011-05-13Merge branch 'cn/log-parse-opt'Libravatar Junio C Hamano1-30/+44
2011-05-13Merge branch 'maint'Libravatar Junio C Hamano2-2/+35
2011-05-13Prepare for 1.7.5.2Libravatar Junio C Hamano2-1/+34
2011-05-13Merge branch 'aw/maint-rebase-i-p-no-ff' into maintLibravatar Junio C Hamano2-2/+32
2011-05-13Merge branch 'js/blame-parsename' into maintLibravatar Junio C Hamano3-3/+14
2011-05-13Merge branch 'gr/cvsimport-alternative-cvspass-location' into maintLibravatar Junio C Hamano1-12/+41
2011-05-13Merge branch 'cj/p4merge' into maintLibravatar Junio C Hamano1-6/+3
2011-05-13Merge branch 'jk/merge-one-file-working-tree' into maintLibravatar Junio C Hamano2-1/+106
2011-05-13Merge branch 'jc/fix-diff-files-unmerged' into maintLibravatar Junio C Hamano16-36/+120
2011-05-13Merge branch 'mz/maint-rename-unmerged' into maintLibravatar Junio C Hamano2-2/+67
2011-05-13t5400: Fix a couple of typosLibravatar Johan Herland1-2/+2
2011-05-12Merge branch 'nd/struct-pathspec'Libravatar Junio C Hamano1-7/+7
2011-05-12Tweak t3102-ls-tree-wildcards to run on WindowsLibravatar Johannes Sixt1-7/+7
2011-05-11Update draft release notes to 1.7.6Libravatar Junio C Hamano1-3/+18
2011-05-11Merge branch 'jn/gitweb-dependency'Libravatar Junio C Hamano1-27/+1
2011-05-11Merge branch 'jc/maint-branch-mergeoptions'Libravatar Junio C Hamano2-15/+58
2011-05-11Merge branch 'jn/maint-test-merge-verify-parents'Libravatar Junio C Hamano2-99/+98
2011-05-11Merge branch 'vh/config-interactive-singlekey-doc'Libravatar Junio C Hamano5-13/+21
2011-05-11Merge branch 'jc/maint-add-p-overlapping-hunks'Libravatar Junio C Hamano3-16/+54
2011-05-11Merge branch 'sr/maint-fast-import-tighten-option-parsing'Libravatar Junio C Hamano1-3/+3
2011-05-11Merge branch 'dm/http-cleanup'Libravatar Junio C Hamano6-114/+80
2011-05-11Merge branch 'jn/ctags'Libravatar Junio C Hamano3-121/+399
2011-05-08t3701: add-p-fix makes the last test to passLibravatar Junio C Hamano1-1/+1
2011-05-08rerere: libify rerere_clear() and rerere_gc()Libravatar Junio C Hamano3-75/+88
2011-05-08Remove gitweb/gitweb.cgi and other legacy targets from main MakefileLibravatar Jakub Narebski1-26/+0
2011-05-08git-instaweb: Simplify build dependency on gitwebLibravatar Jakub Narebski1-1/+1
2011-05-06tests: teach verify_parents to check for extra parentsLibravatar Jonathan Nieder1-0/+1
2011-05-06merge: make branch.<name>.mergeoptions correctly override merge.<option>Libravatar Junio C Hamano2-14/+57
2011-05-06tests: eliminate unnecessary setup test assertionsLibravatar Jonathan Nieder2-99/+97
2011-05-06Update draft release notes to 1.7.6Libravatar Junio C Hamano1-3/+29
2011-05-06Merge branch 'jn/run-command-error-failure'Libravatar Junio C Hamano3-6/+34
2011-05-06Merge branch 'js/info-man-path'Libravatar Junio C Hamano3-5/+21
2011-05-06Merge branch 'im/hashcmp-optim'Libravatar Junio C Hamano1-4/+14
2011-05-06Merge branch 'jk/merge-one-file-working-tree'Libravatar Junio C Hamano2-1/+106
2011-05-06Merge branch 'jc/fix-diff-files-unmerged'Libravatar Junio C Hamano16-36/+120
2011-05-06Merge branch 'cj/p4merge'Libravatar Junio C Hamano1-6/+3
2011-05-06Merge branch 'gr/cvsimport-alternative-cvspass-location'Libravatar Junio C Hamano1-12/+41
2011-05-06Merge branch 'sg/completion-cleanup'Libravatar Junio C Hamano1-161/+60
2011-05-06Merge branch 'js/blame-parsename'Libravatar Junio C Hamano3-3/+14
2011-05-06Merge branch 'jk/format-patch-quote-special-in-from'Libravatar Junio C Hamano2-1/+103
2011-05-06Merge branch 'nd/struct-pathspec'Libravatar Junio C Hamano15-172/+151
2011-05-06Merge branch 'aw/maint-rebase-i-p-no-ff'Libravatar Junio C Hamano2-2/+32
2011-05-06Merge branch 'mg/alias-expose-prefix'Libravatar Junio C Hamano3-1/+32
2011-05-06Merge branch 'mg/diff-uiconfig-doc'Libravatar Junio C Hamano2-12/+30
2011-05-06Merge branch 'maint'Libravatar Junio C Hamano1-1/+1