)]}'
{
  "commit": "eb252616d18811e611fe10f048fb9b04460df671",
  "tree": "f98f9b6c6a9e6b24d8e9637f4ab41cab9fdd89ec",
  "parents": [
    "f7174e6984c08a153d1ba198c4bffe68c5afd873"
  ],
  "author": {
    "name": "Florian Zschocke",
    "email": "florian.zschocke@cycos.com",
    "time": "Sat Jun 21 02:53:21 2014 +0200"
  },
  "committer": {
    "name": "Florian Zschocke",
    "email": "florian.zschocke@cycos.com",
    "time": "Sun Sep 07 22:40:17 2014 +0200"
  },
  "message": "Add integration strategy to merge tickes fast-forward or with commit.\n\nAdd the option to merge a ticket branch to the integration branch\nonly when it can be fast-forwarded, or\nalways with a merge commit, or\nby fast-foward if possible, otherwise with a merge commit.\n\nAdds a new property ticket.mergeType with the valid values\nFAST_FOWARD_ONLY, MERGE_ALWAYS and MERGE_IF_NECESSARY.\n\nMerging and canMerge were refactored to make use of a new\nIntegrationStrategy class for each type of strategy.\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "f8d6c6d05024d8bffa558b6758c0f83eb72603b3",
      "old_mode": 33188,
      "old_path": "src/main/distrib/data/gitblit.properties",
      "new_id": "b29b1c7aaddd303835028aed97861239290a8c78",
      "new_mode": 33188,
      "new_path": "src/main/distrib/data/gitblit.properties"
    },
    {
      "type": "modify",
      "old_id": "279d3c9217edf51cf383ce991b802571f663169f",
      "old_mode": 33188,
      "old_path": "src/main/java/com/gitblit/Constants.java",
      "new_id": "1b1c24c5e1a85e3908d963c16378683718234d0f",
      "new_mode": 33188,
      "new_path": "src/main/java/com/gitblit/Constants.java"
    },
    {
      "type": "modify",
      "old_id": "9e55524d1b4222d33ed6d13385cec576248578b9",
      "old_mode": 33188,
      "old_path": "src/main/java/com/gitblit/git/PatchsetReceivePack.java",
      "new_id": "7d81e61816246f05e108755193cd9a01347b8e5d",
      "new_mode": 33188,
      "new_path": "src/main/java/com/gitblit/git/PatchsetReceivePack.java"
    },
    {
      "type": "modify",
      "old_id": "6a22db5969a5f64280bb2bf94ceed9b89ea23853",
      "old_mode": 33188,
      "old_path": "src/main/java/com/gitblit/manager/RepositoryManager.java",
      "new_id": "b967030f01d637b8ff316ac6df93ee71c98f7bcd",
      "new_mode": 33188,
      "new_path": "src/main/java/com/gitblit/manager/RepositoryManager.java"
    },
    {
      "type": "modify",
      "old_id": "a81c622af4d35f0d319b2802429e7447ea2aaad4",
      "old_mode": 33188,
      "old_path": "src/main/java/com/gitblit/models/RepositoryModel.java",
      "new_id": "67ee1c7e0f4866a756fe930c045b239572762502",
      "new_mode": 33188,
      "new_path": "src/main/java/com/gitblit/models/RepositoryModel.java"
    },
    {
      "type": "modify",
      "old_id": "da51ea98695e6bea4e88e02d444987000a390a09",
      "old_mode": 33188,
      "old_path": "src/main/java/com/gitblit/utils/JGitUtils.java",
      "new_id": "7d7ef6d270d349918b68a5ad704c3907cf40e500",
      "new_mode": 33188,
      "new_path": "src/main/java/com/gitblit/utils/JGitUtils.java"
    },
    {
      "type": "modify",
      "old_id": "ca1bf31032c955a7f60dfcb0ecd028e45252cf81",
      "old_mode": 33188,
      "old_path": "src/main/java/com/gitblit/wicket/pages/TicketPage.java",
      "new_id": "9360766dc57a64431130058b61f5c1e2f174beda",
      "new_mode": 33188,
      "new_path": "src/main/java/com/gitblit/wicket/pages/TicketPage.java"
    }
  ]
}
