summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2006-12-12Merge branch 'master' into js/mergeLibravatar Junio C Hamano31-363/+675
2006-12-12Get rid of the dependency on RCS' merge programLibravatar Johannes Schindelin8-89/+20
2006-12-12git-svn: correctly handle packed-refs in refs/remotes/Libravatar Eric Wong1-1/+9
2006-12-12Merge branch 'maint'Libravatar Junio C Hamano2-19/+23
2006-12-12add test case for recursive mergeLibravatar Junio C Hamano1-0/+70
2006-12-12git-svn: correctly display fatal() error messagesLibravatar Eric Wong1-1/+1
2006-12-12git-svn: allow dcommit to take an alternate headLibravatar Eric Wong2-7/+10
2006-12-12git-svn: enable logging of information not supported by gitLibravatar Eric Wong1-18/+184
2006-12-12Clarify fetch error for missing objects.Libravatar Alex Riesen1-7/+8
2006-12-12Move Fink and Ports check to after config fileLibravatar Brian Gernhardt1-12/+15
2006-12-11shortlog: fix segfault on empty authornameLibravatar Junio C Hamano1-1/+2
2006-12-11shortlog: remove "[PATCH]" prefix from shortlog outputLibravatar Junio C Hamano1-2/+8
2006-12-11Merge branch 'maint'Libravatar Junio C Hamano3-4/+4
2006-12-11Make sure the empty tree exists when needed in merge-recursive.Libravatar Shawn O. Pearce1-1/+1
2006-12-11Don't use memcpy when source and dest. buffers may overlapLibravatar Jim Meyering1-1/+1
2006-12-11no need to install manpages as executableLibravatar Chris Wright1-2/+2
2006-12-08Documentation: simpler shared repository creationLibravatar J. Bruce Fields1-13/+14
2006-12-08shortlog: fix segfault on empty authornameLibravatar Jeff King1-2/+2
2006-12-08Add branch.*.merge warning and documentation updateLibravatar Josef Weidendorfer2-2/+20
2006-12-08Fix perl/ build.Libravatar Junio C Hamano2-1/+2
2006-12-08git-svn: use do_switch for --follow-parent if the SVN library supports itLibravatar Eric Wong1-7/+39
2006-12-08Fix documentation copy&paste typoLibravatar Uwe Zeisberger1-1/+1
2006-12-08git-svn: extra error check to ensure we open a file correctlyLibravatar Eric Wong1-0/+3
2006-12-07Documentation: update git-clone man page with new behaviorLibravatar J. Bruce Fields1-13/+12
2006-12-06Merge branch 'maint'Libravatar Junio C Hamano1-0/+1
2006-12-06cvsserver: Avoid miscounting bytes in Perl v5.8.xLibravatar Martin Langhoff1-0/+1
2006-12-06change the unpack limit treshold to a saner valueLibravatar Nicolas Pitre1-1/+1
2006-12-06Documentation: reorganize cvs-migration.txtLibravatar J. Bruce Fields1-245/+104
2006-12-06git-merge: fix "fix confusion between tag and branch" for realLibravatar Junio C Hamano1-2/+3
2006-12-06git-svn: avoid network timeouts for long-running fetchesLibravatar Eric Wong1-0/+1
2006-12-06gitweb: Allow PNG, GIF, JPEG images to be displayed in "blob" viewLibravatar Jakub Narebski1-8/+22
2006-12-06git-merge: squelch needless error message.Libravatar Junio C Hamano1-1/+1
2006-12-06Merge Libravatar Junio C Hamano1-5/+5
2006-12-06Merge branch 'maint'Libravatar Junio C Hamano2-4/+7
2006-12-06git-reset to remove "$GIT_DIR/MERGE_MSG"Libravatar Junio C Hamano1-1/+2
2006-12-06merge-file: support -p and -q; fix compile warningsLibravatar Johannes Schindelin1-9/+16
2006-12-06Add builtin merge-file, a minimal replacement for RCS mergeLibravatar Johannes Schindelin5-0/+191
2006-12-06cvs-migration: improved section titles, better push/commit explanationLibravatar J. Bruce Fields1-7/+12
2006-12-06cvs-migration document: make the need for "push" more obviousLibravatar Johannes Schindelin1-0/+5
2006-12-05xdl_merge(): fix and simplify conflict handlingLibravatar Johannes Schindelin1-16/+5
2006-12-04Document git-diff whitespace flags -b and -wLibravatar Jakub Narebski1-0/+16
2006-12-04diff -b: ignore whitespace at end of lineLibravatar Johannes Schindelin2-5/+4
2006-12-04Merge branch 'maint'Libravatar Junio C Hamano3-5/+22
2006-12-04unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.Libravatar Junio C Hamano1-3/+5
2006-12-04receive-pack: do not insist on fast-forward outside refs/heads/Libravatar Junio C Hamano1-1/+2
2006-12-04git-fetch: ignore dereferenced tags in expand_refs_wildcardLibravatar Michael Loeffler1-1/+1
2006-12-04git-clone: Rename --use-immingled-remote option to --no-separate-remoteLibravatar Jakub Narebski2-5/+5
2006-12-04gitweb: Fix Atom feed <logo>: it is $logo, not $logo_urlLibravatar Jakub Narebski1-1/+1
2006-12-04Make perl/ build procedure ActiveState friendly.Libravatar Alex Riesen3-7/+57
2006-12-04Pass -M to diff in request-pullLibravatar David Miller1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 15:12:15 +0000