summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2007-04-18Fix overwriting of files when applying contextually independent diffsLibravatar Alex Riesen2-2/+34
2007-04-18git-svn: don't allow globs to match regular filesLibravatar Eric Wong2-0/+6
2007-04-18Allow low-level driver to specify different behaviour during internal merge.Libravatar Junio C Hamano1-0/+12
2007-04-18Custom low-level merge driver: change the configuration scheme.Libravatar Junio C Hamano2-79/+131
2007-04-18Allow the default low-level merge driver to be configured.Libravatar Junio C Hamano1-2/+12
2007-04-18Custom low-level merge driver support.Libravatar Junio C Hamano2-13/+235
2007-04-17Merge branch 'fl/cvsserver'Libravatar Junio C Hamano3-18/+224
2007-04-17Merge branch 'maint'Libravatar Junio C Hamano2-2/+2
2007-04-17Use const qualifier for 'sha1' parameter in delete_ref functionLibravatar Carlos Rica2-2/+2
2007-04-17Update draft release notes for 1.5.2 with accumulated changes.Libravatar Junio C Hamano1-1/+44
2007-04-17Merge branch 'maint'Libravatar Junio C Hamano2-3/+43
2007-04-17Start preparing for 1.5.1.2Libravatar Junio C Hamano2-1/+38
2007-04-17Merge branch 'master' of git://repo.or.cz/git-guiLibravatar Junio C Hamano2-74/+91
2007-04-17Merge branch 'maint' of git://repo.or.cz/git-gui into maintLibravatar Junio C Hamano1-4/+6
2007-04-17Merge branch 'jc/read-tree-df'Libravatar Junio C Hamano4-24/+587
2007-04-17Add a demonstration/test of customized merge.Libravatar Junio C Hamano1-0/+72
2007-04-17Allow specifying specialized merge-backend per path.Libravatar Junio C Hamano1-7/+129
2007-04-17git-gui: Honor TCLTK_PATH if suppliedLibravatar Junio C Hamano1-0/+4
2007-04-17Revert "Allow wish interpreter to be defined with TCLTK_PATH"Libravatar Shawn O. Pearce1-3/+0
2007-04-17git-svn: quiet some warnings when run only with --version/--helpLibravatar Eric Wong1-2/+2
2007-04-17git-svn: respect lower bound of -r/--revision when following parentLibravatar Eric Wong1-1/+4
2007-04-17merge-recursive: separate out xdl_merge() interface.Libravatar Junio C Hamano1-21/+35
2007-04-17Allow more than true/false to attributes.Libravatar Junio C Hamano5-82/+169
2007-04-17Add --ignore-unmatch option to exit with zero status when no files are removed.Libravatar Steven Grimm3-5/+25
2007-04-17Make sure quickfetch is not fooled with a previous, incomplete fetch.Libravatar Junio C Hamano2-0/+93
2007-04-16Clean up object creation to use more common codeLibravatar Linus Torvalds8-43/+23
2007-04-16Use proper object allocators for unknown object nodes tooLibravatar Linus Torvalds3-20/+24
2007-04-16Bisect: rename "t/t6030-bisect-run.sh" to "t/t6030-bisect-porcelain.sh".Libravatar Christian Couder1-1/+1
2007-04-16Bisect: simplify "bisect start" logging.Libravatar Christian Couder1-4/+1
2007-04-16pack-objects: better check_object() performancesLibravatar Nicolas Pitre1-80/+126
2007-04-16add get_size_from_delta()Libravatar Nicolas Pitre2-34/+40
2007-04-16pack-objects: make in_pack_header_size a variable of its ownLibravatar Nicolas Pitre1-14/+12
2007-04-16pack-objects: get rid of create_final_object_list()Libravatar Nicolas Pitre1-55/+72
2007-04-16pack-objects: get rid of reuse_cached_packLibravatar Nicolas Pitre1-72/+14
2007-04-16pack-objects: clean up list sortingLibravatar Nicolas Pitre1-31/+22
2007-04-16pack-objects: rework check_delta_limit usageLibravatar Nicolas Pitre1-44/+32
2007-04-16pack-objects: equal objects in size should delta against newer objectsLibravatar Nicolas Pitre1-1/+1
2007-04-16pack-objects: optimize preferred base handling a bitLibravatar Nicolas Pitre1-15/+12
2007-04-16Merge branch 'js/wrap-log'Libravatar Junio C Hamano8-3/+120
2007-04-16Fix permissions on test scriptsLibravatar Alex Riesen7-0/+0
2007-04-16Fix t4201: accidental arithmetic expansionLibravatar Alex Riesen1-1/+1
2007-04-16send-email: do not leave an empty CC: line if no cc is present.Libravatar Junio C Hamano1-2/+5
2007-04-16Add support for "commit name decorations" to log family of commandsLibravatar Linus Torvalds3-2/+61
2007-04-16Add a generic "object decorator" interface, and make object refs use itLibravatar Linus Torvalds5-65/+116
2007-04-16Merge branch 'maint'Libravatar Junio C Hamano11-137/+222
2007-04-16Have sample update hook not refuse deleting a branch through push.Libravatar Gerrit Pape1-1/+6
2007-04-16variable $projectdesc needs to be set before checking against unchanged default.Libravatar Gerrit Pape1-0/+1
2007-04-16git-rm: Trivial fix for a comment typo.Libravatar Steven Grimm1-1/+1
2007-04-16Update git-annotate/git-blame documentationLibravatar Andrew Ruder4-67/+85
2007-04-16Update git-apply documentationLibravatar Andrew Ruder1-6/+7