summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2006-12-13Merge branch 'jc/read-tree-ignore'Libravatar Junio C Hamano9-20/+139
2006-12-13Merge branch 'ew/rerere'Libravatar Junio C Hamano4-2/+106
2006-12-13Merge branch 'np/addcommit'Libravatar Junio C Hamano6-122/+230
2006-12-13Merge branch 'lh/branch-rename'Libravatar Junio C Hamano5-26/+257
2006-12-13Merge branch 'jc/commit-careful'Libravatar Junio C Hamano2-0/+4
2006-12-13Merge branch 'ap/clone-origin'Libravatar Junio C Hamano1-1/+3
2006-12-13Merge branch 'jc/numstat'Libravatar Junio C Hamano1-1/+4
2006-12-13Merge branch 'rr/cvsexportcommit'Libravatar Junio C Hamano2-166/+145
2006-12-13Merge branch 'ap/branch'Libravatar Junio C Hamano1-5/+87
2006-12-13branch --color: change default color selection.Libravatar Junio C Hamano1-2/+2
2006-12-13Merge branch 'js/merge'Libravatar Junio C Hamano19-179/+715
2006-12-13send-pack: tighten checks for remote namesLibravatar Junio C Hamano2-1/+22
2006-12-13git-push: accept tag <tag> as advertised.Libravatar Junio C Hamano1-5/+30
2006-12-13spurious .sp in manpagesLibravatar Junio C Hamano1-0/+14
2006-12-13git merge: reword failure message.Libravatar Junio C Hamano1-1/+8
2006-12-13Remove uncontested renamed files during merge.Libravatar Shawn Pearce2-1/+98
2006-12-13Merge branch 'maint'Libravatar Junio C Hamano0-0/+0
2006-12-13git-svn: correctly display fatal() error messagesLibravatar Eric Wong1-1/+1
2006-12-13git-svn: exit with status 1 for test failuresLibravatar Eric Wong1-8/+12
2006-12-13Allow subcommand.color and color.subcommand color configurationLibravatar Andy Parkins6-12/+15
2006-12-13git-push: document removal of remote ref with :<dst> pathspecLibravatar Junio C Hamano1-6/+9
2006-12-12merge-recursive: add/add really is modify/modify with an empty baseLibravatar Johannes Schindelin2-30/+26
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-12Colourise git-branch outputLibravatar Andy Parkins1-5/+87
2006-12-11diff --numstat: show binary with '-' to match "apply --numstat"Libravatar Junio C Hamano1-1/+4
2006-12-11Make cvsexportcommit work with filenames with spaces and non-ascii characters.Libravatar Robin Rosenberg2-166/+145
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-10git-commit: allow --only to lose what was staged earlier.Libravatar Junio C Hamano1-11/+1
2006-12-09Documentation/git-commit: rewrite to make it more end-user friendly.Libravatar Junio C Hamano1-76/+157
2006-12-09rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/amLibravatar Eric Wong2-0/+16
2006-12-09git-rerere: add 'gc' command.Libravatar Junio C Hamano2-24/+57
2006-12-09rerere: add clear, diff, and status commandsLibravatar Eric Wong2-2/+57
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