summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-04-20RelNotes: the third batchLibravatar Junio C Hamano1-1/+27
2012-04-20Merge branch 'js/spawn-via-shell-path-fix'Libravatar Junio C Hamano1-0/+4
2012-04-20Merge branch 'ct/advise-push-default'Libravatar Junio C Hamano10-13/+99
2012-04-20Merge branch 'bw/submodule-sed-solaris'Libravatar Junio C Hamano1-2/+3
2012-04-20Merge branch 'jk/run-command-eacces'Libravatar Junio C Hamano6-7/+86
2012-04-20Merge branch 'jc/push-upstream-sanity'Libravatar Junio C Hamano2-8/+72
2012-04-20Merge branch 'jc/am-report-3way'Libravatar Junio C Hamano1-0/+6
2012-04-20Merge branch 'jb/am-include'Libravatar Junio C Hamano2-2/+4
2012-04-20Merge branch 'jc/fmt-merge-msg-people'Libravatar Junio C Hamano2-7/+134
2012-04-17Do not use SHELL_PATH from build system in prepare_shell_cmd on WindowsLibravatar Johannes Sixt1-0/+4
2012-04-16RelNotes: the second batch of topics graduated to 'master'Libravatar Junio C Hamano1-0/+41
2012-04-16Merge branch 'jk/add-p-skip-conflicts'Libravatar Junio C Hamano2-7/+44
2012-04-16Merge branch 'jc/commit-unedited-template'Libravatar Junio C Hamano3-24/+65
2012-04-16Merge branch 'bw/spawn-via-shell-path'Libravatar Junio C Hamano2-1/+12
2012-04-16Merge branch 'wk/gitweb-snapshot-use-if-modified-since'Libravatar Junio C Hamano2-27/+98
2012-04-16Merge branch 'jk/http-backend-keep-committer-ident-env'Libravatar Junio C Hamano3-13/+37
2012-04-16Merge branch 'sl/autoconf'Libravatar Junio C Hamano1-98/+99
2012-04-16Merge branch 'jk/branch-quiet'Libravatar Junio C Hamano5-11/+22
2012-04-16Merge branch 'rs/combine-diff-zero-context-at-the-beginning'Libravatar Junio C Hamano1-1/+1
2012-04-16Merge branch 'jk/diff-no-rename-empty'Libravatar Junio C Hamano9-14/+45
2012-04-16Merge branch 'jc/maint-clean-nested-worktree-in-subdir'Libravatar Junio C Hamano2-11/+43
2012-04-16Merge branch 'rs/unpack-trees-leakfix'Libravatar Junio C Hamano1-10/+17
2012-04-16Merge branch 'nl/rebase-i-cheat-sheet'Libravatar Junio C Hamano1-0/+2
2012-04-15RelNotes: the first batch of topics graduated to 'master'Libravatar Junio C Hamano1-0/+19
2012-04-15Merge branch 'da/difftool-test'Libravatar Junio C Hamano1-0/+11
2012-04-15Merge branch 'zj/test-cred-helper-nicer-prove'Libravatar Junio C Hamano1-24/+45
2012-04-15Merge branch 'jh/notes-merge-in-git-dir-worktree'Libravatar Junio C Hamano4-32/+73
2012-04-15Merge branch 'tr/maint-word-diff-regex-sticky'Libravatar Junio C Hamano2-56/+102
2012-04-15Merge branch 'jn/diffstat-tests'Libravatar Junio C Hamano16-259/+354
2012-04-15Merge branch 'jc/diff-algo-cleanup'Libravatar Junio C Hamano8-25/+24
2012-04-15Merge branch 'jc/commit-hook-authorship'Libravatar Junio C Hamano5-47/+141
2012-04-15Merge branch 'nd/stream-more'Libravatar Junio C Hamano11-75/+221
2012-04-15merge overwrites unstaged changes in renamed fileLibravatar Clemens Buchacher1-0/+9
2012-04-12Fix httpd tests that broke when non-ff push advice changedLibravatar Christopher Tiwald2-2/+2
2012-04-11Kick off post 1.7.10 cycleLibravatar Junio C Hamano3-2/+31
2012-04-11gitweb: Fix unintended "--no-merges" for regular Atom feedLibravatar Sebastian Pipping1-0/+1
2012-04-10unpack-trees: plug minor memory leakLibravatar René Scharfe1-9/+16
2012-04-10unpack-trees: don't perform any index operation if we're not mergingLibravatar René Scharfe1-1/+1
2012-04-10Merge branch 'maint'Libravatar Junio C Hamano2-4/+4
2012-04-10Merge branch 'maint-1.7.9' into maintLibravatar Junio C Hamano0-0/+0
2012-04-10Merge branch 'maint-1.7.8' into maint-1.7.9Libravatar Junio C Hamano2-6/+6
2012-04-10test-subprocess: fix segfault without argumentsLibravatar René Scharfe1-3/+3
2012-04-10submodule: fix prototype of gitmodules_configLibravatar René Scharfe1-1/+1
2012-04-09Fix git-subtree install instructionsLibravatar David A. Greene1-12/+18
2012-04-09Use git-subtree test MakefileLibravatar David A. Greene1-1/+1
2012-04-09Add subtree test MakefileLibravatar David A. Greene1-0/+69
2012-04-09Install git-subtree from contribLibravatar David A. Greene1-20/+21
2012-04-09Use configure settings for git-subtreeLibravatar David A. Greene1-0/+3
2012-04-09Use project config filesLibravatar David A. Greene1-3/+6
2012-04-09Remove unnecessary git-subtree filesLibravatar David A. Greene6-143/+0