Files
git/Documentation
Junio C Hamano a2d7c6c620 Merge branch 'jc/attr'
* 'jc/attr': (28 commits)
  lockfile: record the primary process.
  convert.c: restructure the attribute checking part.
  Fix bogus linked-list management for user defined merge drivers.
  Simplify calling of CR/LF conversion routines
  Document gitattributes(5)
  Update 'crlf' attribute semantics.
  Documentation: support manual section (5) - file formats.
  Simplify code to find recursive merge driver.
  Counto-fix in merge-recursive
  Fix funny types used in attribute value representation
  Allow low-level driver to specify different behaviour during internal merge.
  Custom low-level merge driver: change the configuration scheme.
  Allow the default low-level merge driver to be configured.
  Custom low-level merge driver support.
  Add a demonstration/test of customized merge.
  Allow specifying specialized merge-backend per path.
  merge-recursive: separate out xdl_merge() interface.
  Allow more than true/false to attributes.
  Document git-check-attr
  Change attribute negation marker from '!' to '-'.
  ...
2007-04-21 17:38:00 -07:00
..
2007-03-22 03:05:25 -07:00
2006-12-13 09:41:18 -08:00
2007-04-15 16:01:35 -07:00
2007-04-21 17:38:00 -07:00
2007-02-17 16:16:48 -08:00
2007-02-12 19:33:03 -08:00
2007-02-03 21:49:54 -08:00
2007-02-12 19:33:03 -08:00
2007-04-16 01:14:46 -07:00
2007-04-16 01:14:46 -07:00
2007-04-19 23:06:21 -07:00
2007-03-01 03:27:36 -08:00
2007-04-15 16:01:35 -07:00
2006-06-07 11:49:35 -07:00
2007-04-18 22:08:16 -07:00
2007-04-17 22:17:46 -07:00
2007-03-10 22:07:26 -08:00
2007-01-11 12:58:10 -08:00
2007-02-08 15:35:24 -08:00
2007-02-28 14:18:57 -08:00
2007-04-11 20:02:03 -07:00
2007-03-29 23:44:30 -07:00
2007-02-03 21:49:54 -08:00
2007-04-03 23:44:32 -07:00
2007-04-19 22:38:02 -07:00
2007-02-03 21:49:54 -08:00
2007-04-19 22:38:02 -07:00
2006-06-24 01:11:19 -07:00
2007-02-18 16:18:43 -08:00
2007-02-26 00:26:06 -08:00
2007-03-04 17:20:38 -08:00
2007-03-14 15:56:49 -07:00
2007-03-18 14:43:29 -07:00
2007-03-28 15:28:14 -07:00
2007-04-03 19:27:41 -07:00
2007-04-21 13:57:07 -07:00
2007-04-03 22:47:01 -07:00