summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rr/cvsexportcommit'Junio C Hamano2006-12-132-166/+145
|\
| * Make cvsexportcommit work with filenames with spaces and non-ascii characters.Robin Rosenberg2006-12-112-166/+145
* | Merge branch 'ap/branch'Junio C Hamano2006-12-131-5/+87
|\ \
| * | branch --color: change default color selection.Junio C Hamano2006-12-131-2/+2
| * | Colourise git-branch outputAndy Parkins2006-12-121-5/+87
| |/
* | Merge branch 'js/merge'Junio C Hamano2006-12-1319-179/+715
|\ \
| * | 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
| |\ \
| * | | Get rid of the dependency on RCS' merge programJohannes Schindelin2006-12-128-89/+20
| * | | merge-file: support -p and -q; fix compile warningsJohannes Schindelin2006-12-061-9/+16
| * | | Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin2006-12-065-0/+191
| * | | xdl_merge(): fix and simplify conflict handlingJohannes Schindelin2006-12-051-16/+5
| * | | xdl_merge(): fix thinkoJohannes Schindelin2006-12-021-2/+2
| * | | xdl_merge(): fix an off-by-one bugJohannes Schindelin2006-12-021-5/+5
| * | | merge-recursive: use xdl_merge().Junio C Hamano2006-12-021-57/+41
| * | | xmerge: make return value from xdl_merge() more usable.Junio C Hamano2006-12-021-10/+7
| * | | xdiff: add xdl_merge()Johannes Schindelin2006-12-025-3/+444
* | | | send-pack: tighten checks for remote namesJunio C Hamano2006-12-132-1/+22
* | | | git-push: accept tag <tag> as advertised.Junio C Hamano2006-12-131-5/+30
* | | | spurious .sp in manpagesJunio C Hamano2006-12-131-0/+14
* | | | git merge: reword failure message.Junio C Hamano2006-12-131-1/+8
* | | | Remove uncontested renamed files during merge.Shawn Pearce2006-12-132-1/+98
* | | | Merge branch 'maint'Junio C Hamano2006-12-130-0/+0
|\ \ \ \
| * | | | git-svn: correctly display fatal() error messagesEric Wong2006-12-131-1/+1
| * | | | git-svn: exit with status 1 for test failuresEric Wong2006-12-131-8/+12
* | | | | Allow subcommand.color and color.subcommand color configurationAndy Parkins2006-12-136-12/+15
* | | | | git-push: document removal of remote ref with :<dst> pathspecJunio C Hamano2006-12-131-6/+9
| |_|/ / |/| | |
* | | | 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
|\ \ \ | |/ /
View Lorry Controller Status