]> source.dussan.org Git - jgit.git/commit
Merge branch 'stable-4.9' 48/113448/1
authorDavid Pursehouse <david.pursehouse@gmail.com>
Fri, 15 Dec 2017 00:21:28 +0000 (09:21 +0900)
committerDavid Pursehouse <david.pursehouse@gmail.com>
Fri, 15 Dec 2017 00:21:57 +0000 (09:21 +0900)
commit778d62e5964a7efd142bcf026c950f8e19240408
tree10b80ab73b6fbfc9c7372ff9964c16b459d3fe16
parent5fa129555af6380362701146ea1b1d99426fbc79
parentec7f88eec8f52a2254b82bcb73aa489028ea3b39
Merge branch 'stable-4.9'

* stable-4.9:
  Config: Remove the include functionality

Merged with "-s ours" because the fix on stable conflicts with
the fix already done here.

Change-Id: I85e394422d5dc40ca33ed3a78ddbf5cd1da1664a
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>