summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2007-04-19Contribute a fairly paranoid update hookLibravatar Shawn O. Pearce1-0/+284
2007-04-19Merge branch 'maint'Libravatar Junio C Hamano5-14/+21
2007-04-19Fix working directory errno handling when unlinking a directoryLibravatar Linus Torvalds1-25/+29
2007-04-19Document gitattributes(5)Libravatar Junio C Hamano3-2/+300
2007-04-19Update 'crlf' attribute semantics.Libravatar Junio C Hamano2-60/+89
2007-04-19Documentation: support manual section (5) - file formats.Libravatar Junio C Hamano2-7/+15
2007-04-19document --index-version for index-pack and pack-objectsLibravatar Nicolas Pitre2-0/+10
2007-04-19pack-objects: remove obsolete commentsLibravatar Nicolas Pitre1-11/+3
2007-04-18Update git-config documentationLibravatar Andrew Ruder2-11/+15
2007-04-18Fix unmatched emphasis tag in git-tutorialLibravatar Andrew Ruder1-1/+1
2007-04-18Update git-cherry-pick documentationLibravatar Andrew Ruder1-1/+1
2007-04-18Update git-archive documentationLibravatar Andrew Ruder1-1/+4
2007-04-18Merge branch 'maint'Libravatar Junio C Hamano3-3/+3
2007-04-18fix up strtoul_ui error handlingLibravatar Andy Whitcroft2-2/+2
2007-04-18Simplify code to find recursive merge driver.Libravatar Junio C Hamano1-7/+2
2007-04-18Counto-fix in merge-recursiveLibravatar Junio C Hamano1-1/+4
2007-04-19gitk: Allow user to choose whether to see the diff, old file, or new fileLibravatar Paul Mackerras1-0/+17
2007-04-18git-tar-tree: complete deprecation conversion messageLibravatar Sam Vilain1-1/+1
2007-04-18Tests for core subproject supportLibravatar Alex Riesen1-0/+85
2007-04-18refs.c: add a function to sort a ref list, rather then sorting on addLibravatar Julian Phillips1-21/+89
2007-04-18Merge branch 'maint'Libravatar Junio C Hamano5-3/+43
2007-04-18Fix funny types used in attribute value representationLibravatar Junio C Hamano6-26/+43
2007-04-18git-shortlog: Fix two formatting errors in asciidoc documentationLibravatar Frank Lichtenheld1-1/+3
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