]> source.dussan.org Git - jgit.git/commitdiff
projects / jgit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fa1295 ec7f88e)
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)
* 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>

Trivial merge
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit