diff --git a/book/A-git-in-other-environments/sections/jetbrainsides.asc b/book/A-git-in-other-environments/sections/jetbrainsides.asc index b7d1f5b1b..1def4a3ed 100644 --- a/book/A-git-in-other-environments/sections/jetbrainsides.asc +++ b/book/A-git-in-other-environments/sections/jetbrainsides.asc @@ -1,5 +1,6 @@ === Git in IntelliJ / PyCharm / WebStorm / PhpStorm / RubyMine +(((JetBrains))) JetBrains IDEs (such as IntelliJ IDEA, PyCharm, WebStorm, PhpStorm, RubyMine, and others) ship with a Git Integration plugin. It provides a dedicated view in the IDE to work with Git and GitHub Pull Requests. diff --git a/book/A-git-in-other-environments/sections/sublimetext.asc b/book/A-git-in-other-environments/sections/sublimetext.asc index b303fca9e..d62eff430 100644 --- a/book/A-git-in-other-environments/sections/sublimetext.asc +++ b/book/A-git-in-other-environments/sections/sublimetext.asc @@ -1,5 +1,6 @@ === Git in Sublime Text +(((Sublime Text))) From version 3.2 onwards, Sublime Text has Git integration in the editor. The features are: diff --git a/book/A-git-in-other-environments/sections/visualstudiocode.asc b/book/A-git-in-other-environments/sections/visualstudiocode.asc index d4de8b372..7a646c3b5 100644 --- a/book/A-git-in-other-environments/sections/visualstudiocode.asc +++ b/book/A-git-in-other-environments/sections/visualstudiocode.asc @@ -1,5 +1,6 @@ === Git in Visual Studio Code +(((Visual Studio Code))) Visual Studio Code has Git support built in. You will need to have Git version 2.0.0 (or newer) installed. diff --git a/book/B-embedding-git/sections/jgit.asc b/book/B-embedding-git/sections/jgit.asc index fc042563f..74ae05a38 100644 --- a/book/B-embedding-git/sections/jgit.asc +++ b/book/B-embedding-git/sections/jgit.asc @@ -3,7 +3,7 @@ (((jgit)))(((Java))) If you want to use Git from within a Java program, there is a fully featured Git library called JGit. JGit is a relatively full-featured implementation of Git written natively in Java, and is widely used in the Java community. -The JGit project is under the Eclipse umbrella, and its home can be found at https://www.eclipse.org/jgit/[^]. +The JGit project is under the Eclipse umbrella, and its home can be found at https://projects.eclipse.org/projects/technology.jgit[^]. ==== Getting Set Up @@ -22,7 +22,7 @@ Probably the easiest is to use Maven – the integration is accomplished by addi The `version` will most likely have advanced by the time you read this; check https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit[^] for updated repository information. Once this step is done, Maven will automatically acquire and use the JGit libraries that you'll need. -If you would rather manage the binary dependencies yourself, pre-built JGit binaries are available from https://www.eclipse.org/jgit/download[^]. +If you would rather manage the binary dependencies yourself, pre-built JGit binaries are available from https://projects.eclipse.org/projects/technology.jgit/downloads[^]. You can build them into your project by running a command like this: [source,console] @@ -155,6 +155,6 @@ Many other commands are available through the Git class, including but not limit This is only a small sampling of JGit's full capabilities. If you're interested and want to learn more, here's where to look for information and inspiration: -* The official JGit API documentation can be found at https://www.eclipse.org/jgit/documentation[^]. +* The official JGit API documentation can be found at https://help.eclipse.org/latest/topic/org.eclipse.egit.doc/help/JGit/User_Guide/User-Guide.html[^]. These are standard Javadoc, so your favorite JVM IDE will be able to install them locally, as well. * The JGit Cookbook at https://github.com/centic9/jgit-cookbook[^] has many examples of how to do specific tasks with JGit. diff --git a/images/centralized.png b/images/centralized.png index 4cdaca133..03fe1b5cf 100644 Binary files a/images/centralized.png and b/images/centralized.png differ diff --git a/images/centralized.svg b/images/centralized.svg index b5583f1c7..cc521660b 100644 --- a/images/centralized.svg +++ b/images/centralized.svg @@ -1,39 +1,255 @@ - - + + image/svg+xml - images/centralized + images/local - images/centralized - Created with Sketch. - - - - - developer - - - - developer - - - - developer - + images/local + Created with Sketch. + + + + + File + + + + + + Version Database + + + + Version 3 + + + + Version 2 + + + + Version 1 + + + + + + + + + + + + + + + + Computer A + Central VCS Server + Computer B + + + File + - - - - - - sharedrepository - - - - diff --git a/images/centralized_workflow.svg b/images/centralized_workflow.svg new file mode 100644 index 000000000..b5583f1c7 --- /dev/null +++ b/images/centralized_workflow.svg @@ -0,0 +1,39 @@ + + + + + + image/svg+xml + + images/centralized + + + + images/centralized + Created with Sketch. + + + + + developer + + + + developer + + + + developer + + + + + + + + sharedrepository + + + + +