summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-15fast-import doc: cat-blob and ls responses need to be consumed quicklyLibravatar Jonathan Nieder1-3/+39
2012-04-14submodules: recursive fetch also checks new tags for submodule commitsLibravatar Jens Lehmann1-3/+3
2012-04-14test: am of empty patch should not succeedLibravatar Jonathan Nieder1-1/+1
2012-04-14test: use test_i18ncmp for "Patch format detection failed" messageLibravatar Jonathan Nieder1-1/+1
2012-04-14test: do not rely on US English tracking-info messagesLibravatar Jonathan Nieder2-6/+6
2012-04-12Fix httpd tests that broke when non-ff push advice changedLibravatar Christopher Tiwald2-2/+2
2012-04-11apply: document buffer ownership rules across functionsLibravatar Junio C Hamano1-2/+51
2012-04-11apply: tighten constness of line bufferLibravatar Junio C Hamano1-7/+7
2012-04-11apply: drop unused macroLibravatar Junio C Hamano1-1/+0
2012-04-11blame: accept --need-minimalLibravatar Junio C Hamano1-0/+1
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-11tests: modernise style: more uses of test_line_countLibravatar Stefano Lattarini19-74/+65
2012-04-11revision: insert unsorted, then sort in prepare_revision_walk()Libravatar René Scharfe3-1/+19
2012-04-11commit: use mergesort() in commit_list_sort_by_date()Libravatar René Scharfe1-6/+23
2012-04-11add mergesort() for linked listsLibravatar René Scharfe5-0/+138
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-10var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settingsLibravatar Jonathan Nieder3-0/+18
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-10rev-parse --show-prefix: add in trailing newlineLibravatar Ross Lagerwall2-1/+3
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
2012-04-09Set TEST_DIRECTORYLibravatar David A. Greene1-2/+4
2012-04-09Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346'Libravatar David A. Greene15-0/+2196
2012-04-09rebase -i continue: don't skip commits that only change submodulesLibravatar John Keeping2-1/+31
2012-04-09remote: update builtin usageLibravatar Michael Schubert1-2/+2
2012-04-09git p4: use "git p4" directly in testsLibravatar Pete Wyckoff12-184/+182
2012-04-09git p4: update name in scriptLibravatar Pete Wyckoff1-7/+7
2012-04-09git-p4: move to toplevelLibravatar Pete Wyckoff9-15/+25
2012-04-09Avoid bug in Solaris xpg4/sed as used in submoduleLibravatar Ben Walton1-2/+3
2012-04-09Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8Libravatar Junio C Hamano1-4/+4
2012-04-09Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8Libravatar Junio C Hamano1-2/+2
2012-04-09Merge branch 'tr/cache-tree' into maint-1.7.8Libravatar Junio C Hamano10-11/+142