summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin2006-12-122-30/+26
* Merge branch 'master' into js/mergeJunio C Hamano2006-12-1231-363/+675
|\
| * git-svn: correctly handle packed-refs in refs/remotes/Eric Wong2006-12-121-1/+9
| * Merge branch 'maint'Junio C Hamano2006-12-122-19/+23
| |\
| | * Clarify fetch error for missing objects.Alex Riesen2006-12-121-7/+8
| | * Move Fink and Ports check to after config fileBrian Gernhardt2006-12-121-12/+15
| * | add test case for recursive mergeJunio C Hamano2006-12-121-0/+70
| * | git-svn: correctly display fatal() error messagesEric Wong2006-12-121-1/+1
| * | git-svn: allow dcommit to take an alternate headEric Wong2006-12-122-7/+10
| * | git-svn: enable logging of information not supported by gitEric Wong2006-12-121-18/+184
| * | shortlog: fix segfault on empty authornameJunio C Hamano2006-12-111-1/+2
| * | shortlog: remove "[PATCH]" prefix from shortlog outputJunio C Hamano2006-12-111-2/+8
| * | Merge branch 'maint'Junio C Hamano2006-12-113-4/+4
| |\ \ | | |/
| | * Make sure the empty tree exists when needed in merge-recursive.Shawn O. Pearce2006-12-111-1/+1
| | * Don't use memcpy when source and dest. buffers may overlapJim Meyering2006-12-111-1/+1
| | * no need to install manpages as executableChris Wright2006-12-111-2/+2
| * | Documentation: simpler shared repository creationJ. Bruce Fields2006-12-081-13/+14
| * | shortlog: fix segfault on empty authornameJeff King2006-12-081-2/+2
| * | Add branch.*.merge warning and documentation updateJosef Weidendorfer2006-12-082-2/+20
| * | Fix perl/ build.Junio C Hamano2006-12-082-1/+2
| * | git-svn: use do_switch for --follow-parent if the SVN library supports itEric Wong2006-12-081-7/+39
| * | Fix documentation copy&paste typoUwe Zeisberger2006-12-081-1/+1
| * | git-svn: extra error check to ensure we open a file correctlyEric Wong2006-12-081-0/+3
| * | Documentation: update git-clone man page with new behaviorJ. Bruce Fields2006-12-071-13/+12
| * | Merge branch 'maint'Junio C Hamano2006-12-061-0/+1
| |\ \ | | |/
| | * cvsserver: Avoid miscounting bytes in Perl v5.8.xMartin Langhoff2006-12-061-0/+1
| * | change the unpack limit treshold to a saner valueNicolas Pitre2006-12-061-1/+1
| * | Documentation: reorganize cvs-migration.txtJ. Bruce Fields2006-12-061-245/+104
| * | git-merge: fix "fix confusion between tag and branch" for realJunio C Hamano2006-12-061-2/+3
| * | git-svn: avoid network timeouts for long-running fetchesEric Wong2006-12-061-0/+1
| * | gitweb: Allow PNG, GIF, JPEG images to be displayed in "blob" viewJakub Narebski2006-12-061-8/+22
| * | git-merge: squelch needless error message.Junio C Hamano2006-12-061-1/+1
| * | Merge Junio C Hamano2006-12-061-5/+5
| |\ \
| | * | Use .git/config for storing "origin" shortcut repositoryAndy Parkins2006-11-271-5/+5
| * | | Merge branch 'maint'Junio C Hamano2006-12-062-4/+7
| |\ \ \ | | | |/ | | |/|
| | * | git-reset to remove "$GIT_DIR/MERGE_MSG"v1.4.4.2Junio C Hamano2006-12-061-1/+2
| | * | unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.Junio C Hamano2006-12-041-3/+5
| * | | cvs-migration: improved section titles, better push/commit explanationJ. Bruce Fields2006-12-061-7/+12
| * | | cvs-migration document: make the need for "push" more obviousJohannes Schindelin2006-12-061-0/+5
| * | | Document git-diff whitespace flags -b and -wJakub Narebski2006-12-041-0/+16
| * | | diff -b: ignore whitespace at end of lineJohannes Schindelin2006-12-042-5/+4
| * | | Merge branch 'maint'Junio C Hamano2006-12-043-5/+22
| |\ \ \ | | |/ /
| | * | receive-pack: do not insist on fast-forward outside refs/heads/Junio C Hamano2006-12-041-1/+2
| | * | git-mv: search more precisely for source directory in indexJohannes Schindelin2006-12-042-4/+20
| * | | git-fetch: ignore dereferenced tags in expand_refs_wildcardMichael Loeffler2006-12-041-1/+1
| * | | git-clone: Rename --use-immingled-remote option to --no-separate-remoteJakub Narebski2006-12-042-5/+5
| * | | gitweb: Fix Atom feed <logo>: it is $logo, not $logo_urlJakub Narebski2006-12-041-1/+1
| * | | Make perl/ build procedure ActiveState friendly.Alex Riesen2006-12-043-7/+57
| * | | Pass -M to diff in request-pullDavid Miller2006-12-041-1/+1
| * | | Set permissions of each new file before "cvs add"ing it.Jim Meyering2006-12-042-0/+29
View Lorry Controller Status