summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-07-25Merge branch 'maint-1.6.6' into maint-1.7.0Libravatar Junio C Hamano4-3/+26
2010-07-25Merge branch 'maint-1.6.5' into maint-1.6.6Libravatar Junio C Hamano4-3/+26
2010-07-25request-pull.txt: Document -p optionLibravatar Stephen Boyd1-1/+4
2010-07-25Merge branch 'maint-1.6.4' into maint-1.6.5Libravatar Junio C Hamano3-2/+22
2010-07-25Check size of path buffer before writing into itLibravatar Greg Brockman1-0/+2
2010-07-23git-instaweb: Don't assume Apache executable is named apache2Libravatar Dan McGee1-5/+14
2010-07-23git-instaweb: Fix Apache environment variable passingLibravatar Dan McGee1-2/+5
2010-07-23git-instaweb: Fix custom apache log placementLibravatar Dan McGee1-1/+1
2010-07-21Git 1.7.2Libravatar Junio C Hamano3-9/+10
2010-07-21tests: correct "does reflog exist?" testsLibravatar Junio C Hamano2-49/+11
2010-07-21t/: work around one-shot variable assignment with test_must_failLibravatar Brandon Casey3-8/+40
2010-07-21t/README: correct an exception when breaking a && chain in testsLibravatar Jonathan Nieder1-4/+4
2010-07-20t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_failLibravatar Brandon Casey2-2/+2
2010-07-20t/t3700: convert two uses of negation operator '!' to use test_must_failLibravatar Brandon Casey1-2/+2
2010-07-20Merge branch 'maint'Libravatar Junio C Hamano2-2/+6
2010-07-20t/README: clarify test_must_fail descriptionLibravatar Brandon Casey1-0/+8
2010-07-20Check size of path buffer before writing into itLibravatar Greg Brockman1-0/+2
2010-07-19Merge branch 'maint'Libravatar Junio C Hamano2-3/+10
2010-07-19update-server-info: Shorten read_pack_info_file()Libravatar Ralf Thielow1-3/+0
2010-07-19git add: Add --ignore-missing to SYNOPSISLibravatar Ævar Arnfjörð Bjarmason1-1/+2
2010-07-19git submodule add: Remove old docs about implicit -fLibravatar Ævar Arnfjörð Bjarmason1-4/+0
2010-07-19git submodule add: Require the new --force option to add ignored pathsLibravatar Jens Lehmann3-15/+35
2010-07-19Merge branch 'jl/add-n-ignore-missing'Libravatar Junio C Hamano5-6/+47
2010-07-19Documentation: Explain git-mergetool's use of temporary filesLibravatar David Aguilar1-0/+10
2010-07-19git-svn: write memoized data explicitly to avoid Storable bugLibravatar Sergey Vlasov1-0/+16
2010-07-16Merge branch 'jc/diff-merge-base-multi'Libravatar Junio C Hamano1-13/+0
2010-07-16Only run aggregate-results over actual countsLibravatar Thomas Rast2-2/+2
2010-07-16Add a sample user for the svndump libraryLibravatar Jonathan Nieder4-0/+147
2010-07-16diff A...B: do not limit the syntax too narrowlyLibravatar Junio C Hamano1-13/+0
2010-07-15Merge branch 'jn/paginate-fix'Libravatar Junio C Hamano2-46/+200
2010-07-15Merge branch 'wp/merge-tree-fix'Libravatar Junio C Hamano2-1/+259
2010-07-15Merge branch 'js/merge-rr-fix'Libravatar Junio C Hamano2-3/+3
2010-07-15Merge branch 'jc/diff-merge-base-multi'Libravatar Junio C Hamano1-8/+23
2010-07-15Merge branch 'ns/merge-recursive-uptodate'Libravatar Junio C Hamano1-1/+1
2010-07-15Merge branch 'jn/tests'Libravatar Junio C Hamano1-47/+42
2010-07-15Merge branch 'eb/doc-log-manpage'Libravatar Junio C Hamano1-6/+9
2010-07-15Merge branch 'jn/grep-open'Libravatar Junio C Hamano2-0/+16
2010-07-15Merge branch 'mg/revision-doc'Libravatar Junio C Hamano20-222/+257
2010-07-15Merge branch 'jk/maint-status-keep-index-timestamp'Libravatar Junio C Hamano1-5/+11
2010-07-15Merge branch 'jc/rebase-i-commit-msg-fix'Libravatar Junio C Hamano2-9/+28
2010-07-15Merge branch 'ab/submodule-add-f'Libravatar Junio C Hamano3-3/+29
2010-07-15Merge branch 'bc/maint-makefile-fixes'Libravatar Junio C Hamano1-5/+5
2010-07-15Merge branch 'maint'Libravatar Junio C Hamano3-2/+13
2010-07-15Documentation: add submodule.* to the big configuration variable listLibravatar Jonathan Nieder1-0/+9
2010-07-15gitmodules.5: url can be a relative pathLibravatar Jonathan Nieder1-0/+3
2010-07-15gitweb: fix esc_urlLibravatar Pavan Kumar Sunkara1-2/+1
2010-07-14git --paginate: paginate external commands againLibravatar Jonathan Nieder2-12/+38
2010-07-14MERGE_RR is in .git, not .git/rr-cacheLibravatar Jay Soffian2-3/+3
2010-07-14merge-tree: fix where two branches share no changesLibravatar Will Palmer2-4/+5
2010-07-14add basic tests for merge-treeLibravatar Will Palmer1-0/+257