Commits

Branch selector

 master

User selector

All users

Datepicker

All time

Commit History

Commits on Jan 24, 2015

• Release 0.3.1

  gvilarino

  committed
  af77240

  Copy full SHA for af77240

• Fix a bug where left-hand 'object' attribute were overwritten by empty values from right-hand objects

  gvilarino

  committed
  8efe8be

  Copy full SHA for 8efe8be

Commits on Jan 23, 2015

• Release 0.3.0

  gvilarino

  committed
  df53e5b

  Copy full SHA for df53e5b

• Made empty discarding optional and updated documentation. Also fixed some logic

  gvilarino

  committed
  49f8048

  Copy full SHA for 49f8048

• Prevent attributes with { }, undefined, null or 0 as values to be lost in the merge

  gvilarino

  committed
  0bf730b

  Copy full SHA for 0bf730b

Commits on Sep 9, 2014

• Release 0.2.0

  cristiandouce

  committed
  2e1c808

  Copy full SHA for 2e1c808

• Merge pull request #4 from gvilarino/shallow-merge

  Show description for 7970b5d
  cristiandouce

  committed
  7970b5d

  Copy full SHA for 7970b5d

• Update README.md with usage examples for new opts

  gvilarino

  committed
  765c037

  Copy full SHA for 765c037

• Update README.md with usage examples for new opts

  gvilarino

  committed
  12c33ef

  Copy full SHA for 12c33ef

• Allow Boolean param to provide compatibility with in 0.1.0

  gvilarino

  committed
  6a76e2d

  Copy full SHA for 6a76e2d

• Allow to be a to provide same behavior as in 0.1.0

  gvilarino

  committed
  290389d

  Copy full SHA for 290389d

• Update with options description

  gvilarino

  committed
  3b49c8c

  Copy full SHA for 3b49c8c

• Add opts parameter and shallow merge option

  gvilarino

  committed
  e7ebb13

  Copy full SHA for e7ebb13

Commits on Jan 30, 2014

• Release 0.1.0

  cristiandouce

  committed
  8bc5f7c

  Copy full SHA for 8bc5f7c

• Pin dependencies

  cristiandouce

  committed
  b18be89

  Copy full SHA for b18be89

• Merge pull request #2 from gvilarino/allow-inheritance

  Show description for 24a92dd
  cristiandouce

  committed
  24a92dd

  Copy full SHA for 24a92dd

• Added support for allowing inheritance merging

  gvilarino

  committed
  b91c4b1

  Copy full SHA for b91c4b1

Commits on Oct 12, 2013

• Update README

  cristiandouce

  committed
  76853c4

  Copy full SHA for 76853c4

• Add README.md

  cristiandouce

  committed
  ce7dc58

  Copy full SHA for ce7dc58

• Release 0.0.1

  cristiandouce

  committed
  b742596

  Copy full SHA for b742596

• First commit

  cristiandouce

  committed
  291a441

  Copy full SHA for 291a441