summaryrefslogtreecommitdiffstats
path: root/builtin-merge-recursive.c (unfollow)
Commit message (Expand)AuthorFilesLines
2009-02-03http-push.c: get_remote_object_url() is only used under USE_CURL_MULTIJunio C Hamano1-7/+8
2009-02-01http-push: refactor request url creationTay Ray Chuan1-37/+27
2009-01-29Update draft release notes to 1.6.2Junio C Hamano1-12/+53
2009-01-29GIT 1.6.1.2v1.6.1.2Junio C Hamano3-2/+41
2009-01-29avoid 31-bit truncation in write_loose_objectJeff King1-1/+2
2009-01-29Simplify t3412Johannes Schindelin1-21/+7
2009-01-29Simplify t3411Johannes Schindelin1-48/+17
2009-01-29Simplify t3410Johannes Schindelin1-89/+35
2009-01-29test-lib.sh: introduce test_commit() and test_merge() helpersJohannes Schindelin2-0/+43
2009-01-29lib-rebase.sh: Document what set_fake_editor() doesJohannes Schindelin1-0/+12
2009-01-29t3404 & t3411: undo copy&pasteJohannes Schindelin3-67/+44
2009-01-28gitweb: check if-modified-since for feedsGiuseppe Bilotta1-1/+19
2009-01-28gitweb: last-modified time should be commiter, not authorGiuseppe Bilotta1-1/+1
2009-01-28gitweb: rss channel dateGiuseppe Bilotta1-0/+4
2009-01-28gitweb: rss feed managingEditorGiuseppe Bilotta1-1/+3
2009-01-28gitweb: feed generator metadataGiuseppe Bilotta1-0/+2
2009-01-28gitweb: channel image in rss feedGiuseppe Bilotta1-0/+10
2009-01-28Makefile: Make 'configure --with-expat=path' actually workSerge van den Boom1-1/+9
2009-01-28git-am: minor cleanupsJay Soffian1-8/+4
2009-01-28Windows: Fix intermittent failures of t7701Johannes Sixt1-7/+7
2009-01-28send-pack: do not send unknown object name from ".have" to pack-objectsJunio C Hamano2-22/+127
2009-01-28test-path-utils: Fix off by one, found by valgrindJohannes Schindelin1-1/+1
2009-01-28get_sha1_basic(): fix invalid memory access, found by valgrindJohannes Schindelin1-1/+1
2009-01-27tests: Avoid single-shot environment export for shell function invocationJunio C Hamano2-5/+25
2009-01-27rebase -i: correctly remember --root flag across --continueJunio C Hamano2-2/+102
2009-01-27make: Remove -pthread on Darwin (it is included by cstdlib).Ted Pavlic1-0/+1
2009-01-26Mention "local convention" rule in the CodingGuidelinesNanako Shiraishi1-2/+7
2009-01-26rebase -i --root: fix check for number of argumentsJohannes Schindelin1-1/+2
2009-01-26gittutorial: remove misleading noteMiklos Vajna1-3/+1
2009-01-26diff-options.txt: Fix asciidoc markup issueTeemu Likonen1-1/+1