diff options
author | David Pursehouse <david.pursehouse@gmail.com> | 2018-06-11 08:09:00 +0900 |
---|---|---|
committer | David Pursehouse <david.pursehouse@gmail.com> | 2018-06-11 08:09:09 +0900 |
commit | 0bcf88bc0d8822a8e263868ea47c5e7fc5479b1f (patch) | |
tree | e8d086d82c414109a8915b91ba9fdd29aea9ecf8 | |
parent | 0f8f6746ed5c7ce68203618e2528267dab466ffb (diff) | |
parent | e710f14ed1df5db33021e48e0a48c57467040379 (diff) | |
download | jgit-0bcf88bc0d8822a8e263868ea47c5e7fc5479b1f.tar.gz jgit-0bcf88bc0d8822a8e263868ea47c5e7fc5479b1f.zip |
Merge branch 'stable-5.0'
* stable-5.0:
Fix Javadoc typo
Change-Id: Ib864f5871f8e99d2a776b7ae9f782ec3eb312d50
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
-rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java index 96a796cbdc..953c9768f9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java @@ -237,7 +237,7 @@ public abstract class SystemReader { public abstract FileBasedConfig openUserConfig(Config parent, FS fs); /** - * Open the gitonfig configuration found in the system-wide "etc" directory + * Open the gitconfig configuration found in the system-wide "etc" directory * * @param parent * a config with values not found directly in the returned @@ -245,7 +245,7 @@ public abstract class SystemReader { * @param fs * the file system abstraction which will be necessary to perform * certain file system operations. - * @return the gitonfig configuration found in the system-wide "etc" + * @return the gitconfig configuration found in the system-wide "etc" * directory */ public abstract FileBasedConfig openSystemConfig(Config parent, FS fs); |