diff --git a/A-git-in-other-environments.asc b/A-git-in-other-environments.asc index d73b3598..746dea76 100644 --- a/A-git-in-other-environments.asc +++ b/A-git-in-other-environments.asc @@ -20,8 +20,11 @@ include::book/A-git-in-other-environments/sections/guis.asc[] include::book/A-git-in-other-environments/sections/visualstudio.asc[] -include::book/A-git-in-other-environments/sections/eclipse.asc[] +include::book/A-git-in-other-environments/sections/visualstudiocode.asc[] +include::book/A-git-in-other-environments/sections/jetbrainsides.asc[] + +include::book/A-git-in-other-environments/sections/sublimetext.asc[] include::book/A-git-in-other-environments/sections/bash.asc[] diff --git a/book/A-git-in-other-environments/sections/eclipse.asc b/book/A-git-in-other-environments/sections/eclipse.asc deleted file mode 100644 index 77d4c171..00000000 --- a/book/A-git-in-other-environments/sections/eclipse.asc +++ /dev/null @@ -1,24 +0,0 @@ -////////////////////////// -=== Git in Eclipse -////////////////////////// -=== Eclipse - -(((Eclipse))) -////////////////////////// -Eclipse ships with a plugin called Egit, which provides a fairly-complete interface to Git operations. -It's accessed by switching to the Git Perspective (Window > Open Perspective > Other…, and select "Git"). -////////////////////////// -Eclipse에는 꽤 잘 만든 Egit이라는 플러그인이 들어 있다. -Perspective를 Git으로 변경하면 바로 사용할 수 있다. (메뉴에서 Window > Open > Other… > Git 순으로 선택한다) - -////////////////////////// -.Eclipse's EGit environment. -image::images/egit.png[Eclipse's EGit environment.] -////////////////////////// -.Eclipse의 EGit. -image::images/egit.png[Eclipse의 EGit.] - -////////////////////////// -EGit comes with plenty of great documentation, which you can find by going to Help > Help Contents, and choosing the "EGit Documentation" node from the contents listing. -////////////////////////// -Egit은 문서화가 잘 돼 있다. Help > Help Contents 메뉴를 통해 도움말 페이지를 열고 EGit Documentation을 선택하면 EGit 문서를 볼 수 있다. diff --git a/book/A-git-in-other-environments/sections/guis.asc b/book/A-git-in-other-environments/sections/guis.asc index ec8123f3..5abc8332 100644 --- a/book/A-git-in-other-environments/sections/guis.asc +++ b/book/A-git-in-other-environments/sections/guis.asc @@ -16,8 +16,7 @@ Git의 본진은 터미널이다. ////////////////////////// It's important to note that different interfaces are tailored for different workflows. Some clients expose only a carefully curated subset of Git functionality, in order to support a specific way of working that the author considers effective. -When viewed in this light, none of these tools can be called “better” than any of the others, they're simply more fit for their intended purpose. -Also note that there's nothing these graphical clients can do that the command-line client can't; the command-line is still where you'll have the most power and control when working with your repositories. +When viewed in this light, none of these tools can be called "`better`" than any of the others, they're simply more fit for their intended purpose.Also note that there's nothing these graphical clients can do that the command-line client can't; the command-line is still where you'll have the most power and control when working with your repositories. ////////////////////////// 무슨 인터페이스를 사용하느냐는 중요하지 않지만, 인터페이스에 따라 워크플로도 달라져야 한다. Git의 기능을 엄선해서 제공하는 클라이언트 프로그램이 있는데 이런 도구에서는 지원하는 방법으로만 Git을 사용해야 한다. @@ -66,8 +65,8 @@ Gitk를 실행할 때 옵션을 주고 실행할 수 있는데 대부분 `git lo Gitk는 아래와 같이 생겼다. ////////////////////////// -.The `gitk` history viewer. -image::images/gitk.png[The `gitk` history viewer.] +.The `gitk` history viewer +image::images/gitk.png[The `gitk` history viewer] ////////////////////////// .`gitk` 히스토리 뷰어. image::images/gitk.png[`gitk` 히스토리 뷰어.] @@ -91,9 +90,9 @@ It, too, is easiest to invoke from the command line: 정말 쉽게 실행할 수 있다. [source,console] ------ +---- $ git gui ------ +---- ////////////////////////// And it looks something like this: @@ -101,8 +100,8 @@ And it looks something like this: 이 프로그램은 아래처럼 실행된다. ////////////////////////// -.The `git-gui` commit tool. -image::images/git-gui.png[The `git-gui` commit tool.] +.The `git-gui` commit tool +image::images/git-gui.png[The `git-gui` commit tool] ////////////////////////// .커밋 도구인 `git-gui`. image::images/git-gui.png[커밋 도구인 `git-gui`.] @@ -123,14 +122,15 @@ Diff에서 오른쪽 버튼을 클릭하면 해당 라인이나 해당 Hunk를 ////////////////////////// At the bottom right is the message and action area. -Type your message into the text box and click “Commit” to do something similar to `git commit`. -You can also choose to amend the last commit by choosing the “Amend” radio button, which will update the “Staged Changes” area with the contents of the last commit. -Then you can simply stage or unstage some changes, alter the commit message, and click “Commit” again to replace the old commit with a new one. +Type your message into the text box and click "`Commit`" to do something similar to `git commit`. +You can also choose to amend the last commit by choosing the "`Amend`" radio button, which will update the "`Staged Changes`" area with the contents of the last commit. +Then you can simply stage or unstage some changes, alter the commit message, and click "`Commit`" again to replace the old commit with a new one. ////////////////////////// 오른쪽 하단에는 커밋 메시지와 버튼들이 있다. -텍스트 박스에 메시지를 입력하고 “Commit” 버튼을 클릭하면 `git commit` 을 실행한 것과 같다. -“Amend” 라디오 버튼을 선택하면 최근 커밋도 수정할 수 있다. “Staged Changes” 영역에는 마지막 커밋 내용이 표시된다. -빠트린 것을 Stage 하거나 잘못 커밋한 것을 Unstage 하고 커밋 메시지를 수정하고 나서 다시 “Commit” 버튼을 클릭하면 새 커밋으로 변경된다. +텍스트 박스에 메시지를 입력하고 "`Commit`" 버튼을 클릭하면 `git commit` 을 실행한 것과 같다. +"`Amend`" 라디오 버튼을 선택하면 최근 커밋도 수정할 수 있다. "`Staged Changes`" 영역에는 마지막 커밋 내용이 표시된다. +빠트린 것을 Stage 하거나 잘못 커밋한 것을 Unstage 하고 커밋 메시지를 수정하고 나서 다시 "`Commit`" 버튼을 클릭하면 새 커밋으로 변경된다. +>>>>>>> master ////////////////////////// `gitk` and `git-gui` are examples of task-oriented tools. @@ -140,44 +140,45 @@ Each of them is tailored for a specific purpose (viewing history and creating co `gitk` 는 히스토리 조회용이고 `git-gui` 는 커밋용 도구다. 이 도구로 다른 일은 할 수 없다. ////////////////////////// -==== GitHub for Mac and Windows +==== GitHub for macOS and Windows ////////////////////////// -==== GitHub 클라이언트 +==== macOS와 Windows용 GitHub 클라이언트 -(((GitHub for Mac)))(((GitHub for Windows))) +(((GitHub for macOS)))(((GitHub for Windows))) ////////////////////////// -GitHub has created two workflow-oriented Git clients: one for Windows, and one for Mac. +GitHub has created two workflow-oriented Git clients: one for Windows, and one for macOS. These clients are a good example of workflow-oriented tools – rather than expose _all_ of Git's functionality, they instead focus on a curated set of commonly-used features that work well together. They look like this: ////////////////////////// -GitHub은 'GitHub for Mac'과 'GitHub for Windows'라는 Git 클라이언트를 만들었다. +GitHub은 'GitHub for macOS'과 'GitHub for Windows'라는 Git 클라이언트를 만들었다. 이 클라이언트는 Git의 모든 기능을 지원하지 않는다. 사람들이 많이 사용하는 워크플로를 따르도록 만들었다. 어떻게 생겼는지 한번 보자. -.GitHub for Mac. -image::images/github_mac.png[GitHub for Mac.] +.GitHub for macOS +image::images/github_mac.png[GitHub for macOS] -.GitHub for Windows. -image::images/github_win.png[GitHub for Windows.] +.GitHub for Windows +image::images/github_win.png[GitHub for Windows] ////////////////////////// They are designed to look and work very much alike, so we'll treat them like a single product in this chapter. -We won't be doing a detailed rundown of these tools (they have their own documentation), but a quick tour of the “changes” view (which is where you'll spend most of your time) is in order. +We won't be doing a detailed rundown of these tools (they have their own documentation), but a quick tour of the "`changes`" view (which is where you'll spend most of your time) is in order. +>>>>>>> master ////////////////////////// 이 두 프로그램은 거의 똑같이 생겼다. 그래서 이 둘을 한 프로그램이라고 생각하고 설명한다. -우리는 이 도구에 자세하게 설명하지 않는다. 자세한 것은 설명서를 참고하길 바란다. 아마도 “changes” 뷰를 중심으로 사용하게 될 것이라서 “changes” 뷰를 잘 소개하려고 한다. +우리는 이 도구에 자세하게 설명하지 않는다. 자세한 것은 설명서를 참고하길 바란다. 아마도 "`changes`" 뷰를 중심으로 사용하게 될 것이라서 "`changes`" 뷰를 잘 소개하려고 한다. ////////////////////////// -* On the left is the list of repositories the client is tracking; you can add a repository (either by cloning or attaching locally) by clicking the “+” icon at the top of this area. +* On the left is the list of repositories the client is tracking; you can add a repository (either by cloning or attaching locally) by clicking the "`+`" icon at the top of this area. * In the center is a commit-input area, which lets you input a commit message, and select which files should be included. - (On Windows, the commit history is displayed directly below this; on Mac, it's on a separate tab.) + (On Windows, the commit history is displayed directly below this; on macOS, it's on a separate tab.) * On the right is a diff view, which shows what's changed in your working directory, or which changes were included in the selected commit. -* The last thing to notice is the “Sync” button at the top-right, which is the primary way you interact over the network. +* The last thing to notice is the "`Sync`" button at the top-right, which is the primary way you interact over the network. ////////////////////////// -* 왼쪽에 있는 것은 이 클라이언트가 추적하고 있는 저장소의 목록이다. 아래에 있는 “+” 아이콘을 클릭하면 이미 로컬에 있는 저장소를 추가하거나 새로 Clone 할 수 있다. -* 중앙에는 커밋을 위한 컨트롤이 있다. 메시지를 입력하고 파일을 골라서 커밋할 수 있다. Windows 버전에서는 바로 아래 커밋 히스토리가 보여지지만 Mac 버전에서는 별도 탭에 보여진다. +* 왼쪽에 있는 것은 이 클라이언트가 추적하고 있는 저장소의 목록이다. 아래에 있는 "`+`" 아이콘을 클릭하면 이미 로컬에 있는 저장소를 추가하거나 새로 Clone 할 수 있다. +* 중앙에는 커밋을 위한 컨트롤이 있다. 메시지를 입력하고 파일을 골라서 커밋할 수 있다. Windows 버전에서는 바로 아래 커밋 히스토리가 보여지지만 macOS 버전에서는 별도 탭에 보여진다. * 오른쪽은 워킹 디렉토리 변경된 부분을 보여주는 Diff 뷰다. 커밋을 하나 선택하면 해당 커밋의 내용만 보여준다. -* 오른쪽 위에 있는 “Sync” 버튼을 누르면 외부 저장소와 동기화한다. +* 오른쪽 위에 있는 "`Sync`" 버튼을 누르면 외부 저장소와 동기화한다. [NOTE] ////////////////////////// @@ -197,20 +198,20 @@ GitHub 서비스와 GitHub이 제안하는 워크플로에 초점을 맞춘 툴 ===== 설치 ////////////////////////// -GitHub for Windows can be downloaded from https://windows.github.com[], and GitHub for Mac from https://mac.github.com[]. +GitHub for Windows can be downloaded from https://windows.github.com[], and GitHub for macOS from https://mac.github.com[]. When the applications are first run, they walk you through all the first-time Git setup, such as configuring your name and email address, and both set up sane defaults for many common configuration options, such as credential caches and CRLF behavior. ////////////////////////// -'GitHub for Windows'와 'GitHub for Mac'은 각각 https://windows.github.com[]와 from https://mac.github.com[]에서 내려받을 수 있다. +'GitHub for Windows'와 'GitHub for macOS'은 각각 https://windows.github.com[]와 from https://mac.github.com[]에서 내려받을 수 있다. 프로그램이 처음 실행되면 이름과 이메일 주소같은 설정을 하도록 안내하고 'Credential Cache'나 CRLF 같은 설정도 사람들이 많이 사용하는 값으로 똘똘하게 처리한다. ////////////////////////// -Both are “evergreen” – updates are downloaded and installed in the background while the applications are open. +Both are "`evergreen`" – updates are downloaded and installed in the background while the applications are open. This helpfully includes a bundled version of Git, which means you probably won't have to worry about manually updating it again. -On Windows, the client includes a shortcut to launch Powershell with Posh-git, which we'll talk more about later in this chapter. +On Windows, the client includes a shortcut to launch PowerShell with Posh-git, which we'll talk more about later in this chapter. ////////////////////////// -업데이트는 백그라운드로 다운로드하고 설치해서 늘 최신버전으로 유지한다. -번들로 포함된 Git도 업데이트하기 때문에 업데이트는 고민할 필요가 없다. -'GitHub for Windows'는 Posh-git이 적용된 Powershell을 실행하는 단축아이콘도 만들어 준다. 이 부분은 좀 있다 설명하겠다. +업데이트는 백그라운드로 다운로드하고 설치되기에 프로그램은 늘 최신버전으로 유지된다. +번들로 포함된 Git도 업데이트하기 때문에 Git 프로그램의 업데이트는 고민할 필요가 없다. +'GitHub for Windows'는 Posh-git이 적용된 PowerShell을 실행하는 단축아이콘도 만들어 준다. 이 부분은 뒤에 설명한다. ////////////////////////// The next step is to give the tool some repositories to work with. @@ -219,7 +220,7 @@ If you already have a local repository, just drag its directory from the Finder ////////////////////////// 저장소를 추가해보자. 이 클라이언트는 GitHub에서 접근 가능한 저장소들의 목록을 보여주고 한번에 Clone 할 수 있도록 안내한다. -이미 로컬 저장소가 있으면 간단히 'Mac Finder'나 'Windows Explorer'에서 끌어다(Drag) 놓으면 왼쪽 저장소 목록에 추가된다. +이미 로컬 저장소가 있으면 간단히 'macOS Finder'나 'Windows Explorer'에서 끌어다(Drag) 놓으면 왼쪽 저장소 목록에 추가된다. ////////////////////////// ===== Recommended Workflow @@ -228,26 +229,26 @@ If you already have a local repository, just drag its directory from the Finder ////////////////////////// Once it's installed and configured, you can use the GitHub client for many common Git tasks. -The intended workflow for this tool is sometimes called the “GitHub Flow.” +The intended workflow for this tool is sometimes called the "`GitHub Flow.`" We cover this in more detail in <>, but the general gist is that (a) you'll be committing to a branch, and (b) you'll be syncing up with a remote repository fairly regularly. ////////////////////////// 설치하고 설정을 마쳤으면 평소 Git을 사용하듯이 GitHub 클라이언트를 사용할 수 있다. -이 툴은 <>에서 설명한 “GitHub Flow” 를 지원하도록 설계했다. +이 툴은 <>에서 설명한 "`GitHub Flow.`" 를 지원하도록 설계했다. 하지만 하는 일을 매우 단순하게 나눠보면 브랜치에 커밋하거나 리모트 저장소와 동기화 시키는 일로 나눠 볼 수 있다. ////////////////////////// Branch management is one of the areas where the two tools diverge. -On Mac, there's a button at the top of the window for creating a new branch: +On macOS, there's a button at the top of the window for creating a new branch: ////////////////////////// 브랜치 관리는 두 버전이 조금 다르다. -'GitHub for Mac'에서는 Windows의 위쪽에 있는 버튼으로 브랜치를 만들 수 있다. +'GitHub for macOS'에서는 창의 위쪽에 있는 버튼으로 브랜치를 만들 수 있다. ////////////////////////// -.“Create Branch” button on Mac. -image::images/branch_widget_mac.png[“Create Branch” button on Mac.] +."`Create Branch`" button on macOS +image::images/branch_widget_mac.png[“Create Branch” button on macOS] ////////////////////////// -.Mac의 “Create Branch” 버튼 -image::images/branch_widget_mac.png[Mac의 “Create Branch” 버튼.] +.macOS의 "`Create Branch`" 버튼 +image::images/branch_widget_mac.png[macOS의 “Create Branch“ 버튼.] ////////////////////////// On Windows, this is done by typing the new branch's name in the branch-switching widget: @@ -255,8 +256,8 @@ On Windows, this is done by typing the new branch's name in the branch-switching 'GitHub for Windows'에서는 브랜치를 바꾸는 위젯에서 브랜치 이름을 새로 입력하면 된다. ////////////////////////// -.Creating a branch on Windows. -image::images/branch_widget_win.png[Creating a branch on Windows.] +.Creating a branch on Windows +image::images/branch_widget_win.png[Creating a branch on Windows] ////////////////////////// .Windows에서 브랜치 만들기. image::images/branch_widget_win.png[Windows에서 브랜치 만들기.] @@ -264,19 +265,21 @@ image::images/branch_widget_win.png[Windows에서 브랜치 만들기.] ////////////////////////// Once your branch is created, making new commits is fairly straightforward. Make some changes in your working directory, and when you switch to the GitHub client window, it will show you which files changed. -Enter a commit message, select the files you'd like to include, and click the “Commit” button (ctrl-enter or ⌘-enter). +Enter a commit message, select the files you'd like to include, and click the "`Commit`" button (ctrl-enter or ⌘-enter). ////////////////////////// 브랜치를 만들면 즉시 커밋할 수 있다. 워킹 디렉토리에서 작업을 하고 GitHub 클라이언트로 창을 바꾸면 무엇을 수정했는지 보여준다. -커밋 메시지를 입력하고 파일을 선택하고 나서 “Commit” 버튼을 클릭하면('ctrl-enter'이나 '⌘-enter') 커밋된다. +커밋 메시지를 입력하고 파일을 선택하고 나서 "`Commit`" 버튼을 클릭하면('ctrl-enter' 또는 '⌘-enter') 커밋된다. +>>>>>>> master ////////////////////////// -The main way you interact with other repositories over the network is through the “Sync” feature. +The main way you interact with other repositories over the network is through the "`Sync`" feature. Git internally has separate operations for pushing, fetching, merging, and rebasing, but the GitHub clients collapse all of these into one multi-step feature. Here's what happens when you click the Sync button: ////////////////////////// -GitHub 클라이언트에서는 “Sync” 기능이 외부 저장소와 통신하는 방법이다. -Git은 Push, Fetch, Merge, Rebase 각각 다른 기능이지만 GitHub 클라이언트는 “Sync” 에 전부 녹여 넣었다. +GitHub 클라이언트에서는 "`Sync`" 기능이 외부 저장소와 통신하는 방법이다. +Git은 Push, Fetch, Merge, Rebase 각각 다른 기능이지만 GitHub 클라이언트는 "`Sync`" 에 전부 녹여 넣었다. +>>>>>>> master ////////////////////////// . `git pull --rebase`. @@ -312,9 +315,9 @@ However, if your workflow is different, or you want more control over how and wh ////////////////////////// There are a number of other graphical Git clients, and they run the gamut from specialized, single-purpose tools all the way to apps that try to expose everything Git can do. -The official Git website has a curated list of the most popular clients at http://git-scm.com/downloads/guis[]. +The official Git website has a curated list of the most popular clients at https://git-scm.com/downloads/guis[]. A more comprehensive list is available on the Git wiki site, at https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools#Graphical_Interfaces[]. ////////////////////////// Git GUI 클라이언트에는 종류가 많다. 범용으로 만들어진 것도 있고 아닌 것도 있다. -Git 공식 웹사이트인 http://git-scm.com/downloads/guis[]에는 많이 사용하는 클라이언트를 소개한다. +Git 공식 웹사이트인 https://git-scm.com/downloads/guis[] 에는 많이 사용하는 클라이언트를 소개한다. Git 위키 사이트에는(https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools#Graphical_Interfaces[]) 더 많은 클라이언트가 정리돼 있다. diff --git a/book/A-git-in-other-environments/sections/jetbrainsides.asc b/book/A-git-in-other-environments/sections/jetbrainsides.asc new file mode 100644 index 00000000..f593217a --- /dev/null +++ b/book/A-git-in-other-environments/sections/jetbrainsides.asc @@ -0,0 +1,25 @@ +////////////////////////// +=== Git in IntelliJ / PyCharm / WebStorm / PhpStorm / RubyMine +////////////////////////// +=== IntelliJ / PyCharm / WebStorm / PhpStorm / RubyMine + +////////////////////////// +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. +////////////////////////// +JetBrains IDE (IntelliJ IDEA, PyCharm, WebStorm, PhpStorm, RubyMine, 기타 등등)는 Git Integration 플러그인을 내장하고 있다. +이 플러그인은 Git이나 GitHub Pull Request 전용 UI를 제공한다. + +////////////////////////// +.Version Control ToolWindow in JetBrains IDEs +image::images/jb.png[Version Control ToolWindow in JetBrains IDEs] +////////////////////////// +.JetBrains IDE 의 버전 관리 ToolWindow +image::images/jb.png[JetBrains IDE 의 버전 관리 ToolWindow] + +////////////////////////// +The integration relies on the command-line git client, and requires one to be installed. +The official documentation is available at https://www.jetbrains.com/help/idea/using-git-integration.html[]. +////////////////////////// +Git Integration 플러그인은 git 명령어를 사용하므로 git 설치가 필요하다. +Git Integration 플러그인에 대한 공식 문서는 https://www.jetbrains.com/help/idea/using-git-integration.html[] 에서 제공한다. diff --git a/book/A-git-in-other-environments/sections/powershell.asc b/book/A-git-in-other-environments/sections/powershell.asc index 1b001887..c8c7ab77 100644 --- a/book/A-git-in-other-environments/sections/powershell.asc +++ b/book/A-git-in-other-environments/sections/powershell.asc @@ -1,47 +1,60 @@ [[_git_powershell]] -=== Git in Powershell +=== Git in PowerShell -(((powershell)))(((tab completion, powershell)))(((shell prompts, powershell))) +(((PowerShell)))(((tab completion, PowerShell)))(((shell prompts, PowerShell))) (((posh-git))) ////////////////////////// -The legacy command-line terminal on Windows (`cmd.exe`) isn't really capable of a customized Git experience, but if you're using Powershell, you're in luck. -This also works if you're running PowerShell on a non-Windows platform like Debian. -A package called Posh-Git (https://github.com/dahlbyk/posh-git[]) provides powerful tab-completion facilities, as well as an enhanced prompt to help you stay on top of your repository status. +The legacy command-line terminal on Windows (`cmd.exe`) isn't really capable of a customized Git experience, but if you're using PowerShell, you're in luck. +This also works if you're running PowerShell Core on Linux or macOS. +A package called posh-git (https://github.com/dahlbyk/posh-git[]) provides powerful tab-completion facilities, as well as an enhanced prompt to help you stay on top of your repository status. It looks like this: ////////////////////////// -Windows의 표준 CLI 터미널인 `cmd.exe` 는 Git을 사용하기에 별로 좋지 않다. Powershell을 쓸 줄 안다면 Powershell을 사용하는 것이 낫다. -PowerShell을 Windows가 아닌 Debian 같은 환경에서 사용한다면 이어지는 내용을 동일하게 적용해볼 수 있다. +Windows의 표준 CLI 터미널인 `cmd.exe` 는 Git을 사용하기에 별로 좋지 않다. PowerShell을 쓸 줄 안다면 PowerShell을 사용하는 것이 낫다. +PowerShell을 Windows가 아닌 Linux나 macOS 같은 환경에서 사용한다면 이어지는 내용을 동일하게 적용해 볼 수 있다. Posh-Git(https://github.com/dahlbyk/posh-git[]) 이라는 프로젝트가 있어서 Tab 자동완성과 저장소 상태를 보여주는 프롬프트도 사용할 수 있다. ////////////////////////// -.Powershell with Posh-git. -image::images/posh-git.png[Powershell with Posh-git.] +.PowerShell with Posh-git +image::images/posh-git.png[PowerShell with Posh-git] ////////////////////////// -.Posh-git을 사용 중인 Powershell. -image::images/posh-git.png[Posh-git을 사용 중인 Powershell.] +.Posh-git을 사용 중인 PowerShell +image::images/posh-git.png[Posh-git을 사용 중인 PowerShell] ////////////////////////// ==== Installation ////////////////////////// ==== 설치 + ////////////////////////// ===== Prerequisites (Windows only) ////////////////////////// ===== 필요한 것 (Windows 해당) ////////////////////////// -Before you're able to run PowerShell scripts on your machine, you need to set your local ExecutionPolicy to RemoteSigned (Basically anything except Undefined and Restricted). If you choose AllSigned instead of RemoteSigned, also local scripts (your own) need to be digitally signed in order to be executed. With RemoteSigned, only Scripts having the "ZoneIdentifier" set to Internet (were downloaded from the web) need to be signed, others not. -If you're an administrator and want to set it for all Users on that machine, use "-Scope LocalMachine". -If you're a normal user, without administrative rights, you can use "-Scope CurrentUser" to set it only for you. -More about PowerShell Scopes: (https://technet.microsoft.com/de-de/library/hh847849.aspx[]) -More about PowerShell ExecutionPolicy: (https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/set-executionpolicy[]) +Before you're able to run PowerShell scripts on your machine, you need to set your local `ExecutionPolicy` to `RemoteSigned` (basically, anything except `Undefined` and `Restricted`). +If you choose `AllSigned` instead of `RemoteSigned`, also local scripts (your own) need to be digitally signed in order to be executed. +With `RemoteSigned`, only scripts having the `ZoneIdentifier` set to `Internet` (were downloaded from the web) need to be signed, others not. +If you're an administrator and want to set it for all users on that machine, use `-Scope LocalMachine`. +If you're a normal user, without administrative rights, you can use `-Scope CurrentUser` to set it only for you. + +More about PowerShell Scopes: https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_scopes[]. + +More about PowerShell ExecutionPolicy: https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/set-executionpolicy[]. + +To set the value of `ExecutionPolicy` to `RemoteSigned` for all users use the next command: ////////////////////////// -PowerShell 스크립트가 실행되게 하려면 우선 ExecutionPolicy 정책을 RemoteSigned 값(Undefined 또는 Restricted 제외한 허용)으로 변경해야 한다. RemoteSigned 값이 아닌 AllSigned 값으로 설정하면 스크립트를 실행하기 위해 전자서명 과정이 필요하다. RemoteSigned 값으로 설정하면 ZoneIdentifier가 Internet으로 설정된 경우(주로 웹에서 다운로드한 파일)만 전자서명이 필요하고 나머지 파일에 대해서는 전자서명이 필요하지 않다. +PowerShell 스크립트가 실행되게 하려면 우선 'ExecutionPolicy' 정책을 'RemoteSigned' 값('Undefined' 또는 'Restricted' 제외한 허용)으로 변경해야 한다. +'RemoteSigned' 값이 아닌 'AllSigned' 값으로 설정하면 스크립트를 실행하기 위해 전자서명 과정이 필요하다. +'RemoteSigned' 값으로 설정하면 'ZoneIdentifier'가 'Internet'으로 설정된 경우(주로 웹에서 다운로드한 파일)만 전자서명이 필요하고 나머지 파일에 대해서는 전자서명이 필요하지 않다. Windows 시스템의 관리자 권한이 있다면 모든 사용자가 PowerShell을 사용할 수 있도록 "-Scope LocalMachine" 옵션을 사용할 수 있다. 일반적인 사용자라면 관리자 권한이 없기 때문에 "-Scope CurrentUser" 옵션으로 자신만이 사용가능하도록 설정할 수 있다. -PowerShell의 Scope에 대한 자세한 내용은 https://technet.microsoft.com/de-de/library/hh847849.aspx[] 에서 찾아볼 수 있다. + +PowerShell의 Scope에 대한 자세한 내용은 https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_scopes[] 에서 찾아볼 수 있다. + PowerShell의 ExecutionPolicy에 대한 자세한 내용은 https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/set-executionpolicy[] 에서 찾아볼 수 있다. +모든 사용자를 대상으로 `ExecutionPolicy`의 값을 `RemoteSigned`로 변경하려면 다음 명령을 실행한다: + [source,powershell] ----- > Set-ExecutionPolicy -Scope LocalMachine -ExecutionPolicy RemoteSigned -Force @@ -57,22 +70,21 @@ If you have at least PowerShell 5 or PowerShell 4 with PackageManagement install More information about PowerShell Gallery: https://docs.microsoft.com/en-us/powershell/scripting/gallery/overview[]. ////////////////////////// -PowerShell 버전 5 이상을 사용하거나 PowerShell 4를 PackageManagement 모듈(Cmdlets)을 설치해서 사용한다면 패키지 관리자를 통해서 Posh-Git을 설치할 수 있다. +PowerShell 버전 5 이상을 사용하거나 PowerShell 4를 PackageManagement 모듈(Cmdlets)을 설치해서 사용한다면 패키지 관리자를 통해서 posh-git을 설치할 수 있다. -자세한 요구사항은 https://docs.microsoft.com/en-us/powershell/scripting/gallery/overview[] 에서 확인할 수 있다. +자세한 정보는 ttps://docs.microsoft.com/en-us/powershell/scripting/gallery/overview[] 에서 확인할 수 있다. [source,powershell] ----- -> Set-PSRepository -Name PSGallery -InstallationPolicy Trusted -> Update-Module PowerShellGet -Force -> Install-Module Posh-Git -Scope AllUsers +> Install-Module posh-git -Scope CurrentUser -Force +> Install-Module posh-git -Scope CurrentUser -AllowPrerelease -Force # Newer beta version with PowerShell Core support ----- ////////////////////////// -If you want to install Posh-Git only for the current user and not globally, use "-Scope CurrentUser" instead. +If you want to install posh-git for all users, use `-Scope AllUsers` instead and execute the command from an elevated PowerShell console. If the second command fails with an error like `Module 'PowerShellGet' was not installed by using Install-Module`, you'll need to run another command first: ////////////////////////// -Posh-Git을 설치할 모든 사용자에 설치하지 않도 자신만 사용하게 "-Scope CurrentUser" 옵션을 적용한다. +사용자 모두가 사용할 수 있도록 posh-git을 설치하려면 `-Scope CurrentUser` 옵션을 사용하며, 관리자 권한으로 실행한 PowerShell 콘솔에서 명령을 실행해야 한다. 코드의 두 번째 명령을 실행했을 때 `Module 'PowerShellGet' was not installed by using Install-Module` 같은 오류 메시지가 발생한다면 다음 명령을 먼저 실행해보기 바란다. [source,powershell] @@ -82,10 +94,10 @@ Posh-Git을 설치할 모든 사용자에 설치하지 않도 자신만 사용 ////////////////////////// Then you can go back and try again. -This happens, because the modules that ship with Windows Powershell are signed with a different publishment certificate. +This happens, because the modules that ship with Windows PowerShell are signed with a different publishment certificate. ////////////////////////// 이 명령을 실행한 후에 앞서 실패한 명령을 다시 실행해본다. -이 오류는 Windows Powershell에 이미 포함되어 배포한 모듈의 인증서가 일치하지 않기 때문이다. +이 오류는 Windows PowerShell과 함께 배포된 모듈의 인증서가 일치하지 않기 때문이다. ////////////////////////// ===== Update PowerShell Prompt @@ -93,16 +105,22 @@ This happens, because the modules that ship with Windows Powershell are signed w ===== PowerShell 프롬프트에 Git 정보 표시 ////////////////////////// -To include git information in your prompt, posh-git needs to be imported. To do this automatically, include the import statement into you $profile script. This script is executed everytime you open a new PowerShell prompt. -Keep in mind, that there are multiple $profile scripts. E. g. one for the console and a separate one for the ISE. +To include git information in your prompt, the posh-git module needs to be imported. +To have posh-git imported every time PowerShell starts, execute the `Add-PoshGitToProfile` command which will add the import statement into your `$profile` script. +This script is executed everytime you open a new PowerShell console. +Keep in mind, that there are multiple `$profile` scripts. +E. g. one for the console and a separate one for the ISE. ////////////////////////// -PowerShell 프롬프트에 Git 정보를 표시하려면 posh-git을 Import 해야 한다. 이를 자동으로 하려면 import 구문을 $profile 스크립트에 추가하면 된다. 이 스크립트는 PowerShell 프롬프트가 나타날 때 마다 실행된다. -염두해 둘 부분은 $profile 스크립트가 여럿일 수 있다는 점이다. console을 위한 스크립트와 ISE(통합 스크립팅 환경)를 위한 스크립트가 분리되어 있을 수 있다. +PowerShell 프롬프트에 Git 정보를 표시하려면 posh-git을 Import 해야 한다. +이를 자동으로 하려면 import 구문을 $profile 스크립트에 추가하면 되는데 `Add-PoshGitToProfile` 명령을 통해 가능하다. +이 스크립트는 PowerShell 콘솔을 새로 실행할 때 마다 실행된다. +염두해 둘 부분은 $profile 스크립트가 다수라는 점이다. +예를 들어 어떤 것은 PowerShell 콘솔을 위한 스크립트이고 어떤 것은 ISE(통합 스크립팅 환경)를 위한 스크립트이다. [source,powershell] ----- -> New-Item -Name $(Split-Path -Path $profile) -ItemType Directory -Force -> 'Import-Module Posh-Git' | Out-File -Append -Encoding default -FilePath $profile +> Import-Module posh-git +> Add-PoshGitToProfile -AllHosts ----- ////////////////////////// @@ -111,19 +129,26 @@ PowerShell 프롬프트에 Git 정보를 표시하려면 posh-git을 Import 해 ===== 소스로 설치 ////////////////////////// -Just download a Posh-Git release from (https://github.com/dahlbyk/posh-git[]), and uncompress it to the `WindowsPowershell` directory. -Then open a Powershell prompt as an administrator, and do this: +Just download a posh-git release from https://github.com/dahlbyk/posh-git/releases[], and uncompress it. +Then import the module using the full path to the `posh-git.psd1` file: ////////////////////////// -https://github.com/dahlbyk/posh-git[] 에서 Posh-Git을 내려받아 `WindowsPowershell` 디렉토리에 압축을 풀어 놓는다. -그리고 관리자 권한으로 Powershell 프롬프트를 열고 아래와 같이 실행한다. +https://github.com/dahlbyk/posh-git/releases[] 에서 posh-git을 내려받아 압축을 푼다. +그리고 `posh-git.psd1` 파일의 절대 경로를 입력하여 Import-Module 명령으로 모듈을 불러들인다. [source,powershell] ----- -> cd ~\Documents\WindowsPowerShell\Module\posh-git -> .\install.ps1 +> Import-Module \src\posh-git.psd1 +> Add-PoshGitToProfile -AllHosts ----- ////////////////////////// -This will add the proper line to your `profile.ps1` file, and posh-git will be active the next time you open your prompt. +This will add the proper line to your `profile.ps1` file, and posh-git will be active the next time you open PowerShell. +////////////////////////// +이렇게 `profile.ps1` 파일 내 적절한 위치에 추가한 `posh-git` 은 PowerShell를 다음 열 때 부터 적용된다. + +////////////////////////// +For a description of the Git status summary information displayed in the prompt see: https://github.com/dahlbyk/posh-git/blob/master/README.md#git-status-summary-information[] +For more details on how to customize your posh-git prompt see: https://github.com/dahlbyk/posh-git/blob/master/README.md#customization-variables[]. ////////////////////////// -이렇게 `profile.ps1` 파일에 추가한 `posh-git` 은 프롬프트를 새로 열 때 부터 적용된다. +프롬프트에 표시되는 Git 상태 정보에 대한 자세한 내용은 https://github.com/dahlbyk/posh-git/blob/master/README.md#git-status-summary-information[] 에서 찾아볼 수 있다. +posh-git 프롬프트를 사용자화 하기 위한 자세한 정보는 https://github.com/dahlbyk/posh-git/blob/master/README.md#customization-variables[] 에서 찾아볼 수 있다. diff --git a/book/A-git-in-other-environments/sections/sublimetext.asc b/book/A-git-in-other-environments/sections/sublimetext.asc new file mode 100644 index 00000000..762e6b84 --- /dev/null +++ b/book/A-git-in-other-environments/sections/sublimetext.asc @@ -0,0 +1,34 @@ +////////////////////////// +=== Git in Sublime Text +////////////////////////// +=== Sublime Text + +////////////////////////// +From version 3.2 onwards, Sublime Text has git integration in the editor. +////////////////////////// +Sublime Text 버전 3.2 이상에서는 Git 연동 기능이 편집기에 내장되어 있다. + +////////////////////////// +The features are: +////////////////////////// +내장된 기능: + +////////////////////////// +* The sidebar will show the git status of files and folders with a badge/icon. +* Files and folders that are in your .gitignore file will be faded out in the sidebar. +* In the status bar, you can see the current git branch and how many modifications you have made. +* All changes to a file are now visible via markers in the gutter. +* You can use part of the Sublime Merge git client functionality from within Sublime Text. + This requires that Sublime Merge is installed. See: https://www.sublimemerge.com/[]. +////////////////////////// +* 사이드바에 표시되는 파일이나 디렉토리에 아이콘이나 배지로 Git 상태가 표시된다. +* .gitignore 파일에 정의된 파일과 디렉토리는 사이드바에서 연한색으로 표시된다. +* 상태표시줄에서 Git의 현재 브랜치 정보와 얼마나 많은 변경사항이 있는지에 대해 표시된다. +* 파일 편집 화면의 Gutter 부분에서 파일 내 변화한 부분을 표시해준다. +* Sublime Merge 라는 Git Client를 Sublime Text 안에서 사용할 수도 있다. + Sublime Merge가 설치되어 있는 경우 사용이 가능하며 https://www.sublimemerge.com/[] 에서 다운로드 할 수 있다. + +////////////////////////// +The official documentation for Sublime Text can be found here: https://www.sublimetext.com/docs/3/git_integration.html[]. +////////////////////////// +Sublime Text의 Git 관련 내장 기능에 대한 공식 문서는 https://www.sublimetext.com/docs/3/git_integration.html[] 에서 살펴볼 수 있다. diff --git a/book/A-git-in-other-environments/sections/visualstudio.asc b/book/A-git-in-other-environments/sections/visualstudio.asc index 023e3110..11f0c387 100644 --- a/book/A-git-in-other-environments/sections/visualstudio.asc +++ b/book/A-git-in-other-environments/sections/visualstudio.asc @@ -5,52 +5,37 @@ (((Visual Studio))) ////////////////////////// -Starting with Visual Studio 2013 Update 1, Visual Studio users have a Git client built directly into their IDE. -Visual Studio has had source-control integration features for quite some time, but they were oriented towards centralized, file-locking systems, and Git was not a good match for this workflow. -Visual Studio 2013's Git support has been separated from this older feature, and the result is a much better fit between Studio and Git. +Visual Studio has Git tooling built directly into the IDE, starting with Visual Studio 2019 version 16.8. ////////////////////////// -Visual Studio 2013 Update 1부터 Git 클라이언트가 Visual Studio에 들어갔다. -Visual Studio에도 오랫동안 버전관리 기능이 들어 있었다. 이 버전관리 시스템은 Git과는 방식이 다르다. 중앙 집중식이고 파일을 잠그는 방식이다. -Visual Studio 2013은 Git에 어울리는 워크플로를 따를 수 있도록 Git을 지원한다. +Visual Studio 2019 버전 16.8 이상의 경우 Git 기능이 IDE에 내장되어 있다. ////////////////////////// -To locate the feature, open a project that's controlled by Git (or just `git init` an existing project), and select View > Team Explorer from the menu. -You'll see the "Connect" view, which looks a bit like this: +The tooling supports the following Git functionality: ////////////////////////// -Git으로 관리하는 프로젝트나 `git init` 을 해서 새로 관리하도록 설정한 프로젝트를 열면 이 기능을 사용할 수 있다. View > Team Explorer 메뉴를 선택한다. -그럼 "Connect" 뷰를 보여주는데 아래와 같이 생겼다. +IDE에 내장된 Git은 다음과 같은 기능을 제공한다. ////////////////////////// -.Connecting to a Git repository from Team Explorer. -image::images/vs-1.png[Connecting to a Git repository from Team Explorer.] -////////////////////////// -.Team Explorer에서 Git 저장소에 연결하기. -image::images/vs-1.png[Team Explorer에서 Git 저장소에 연결하기.] - -////////////////////////// -Visual Studio remembers all of the projects you've opened that are Git-controlled, and they're available in the list at the bottom. -If you don't see the one you want there, click the "Add" link and type in the path to the working directory. -Double clicking on one of the local Git repositories leads you to the Home view, which looks like <>. -This is a hub for performing Git actions; when you're _writing_ code, you'll probably spend most of your time in the "Changes" view, but when it comes time to pull down changes made by your teammates, you'll use the "Unsynced Commits" and "Branches" views. -////////////////////////// -Visual Studio는 한 번 열었던 Git 프로젝트는 모두 저장해두기 때문에 하단에 있는 목록에서 찾을 수 있다. -찾는 프로젝트가 목록에 없으면 "Add" 링크를 클릭해서 워킹 디렉토리의 경로를 입력한다. -로컬 Git 저장소 중 하나를 더블 클릭하면 Home 뷰로 이동한다. Home 뷰는 <> 처럼 생겼다. -Home 뷰는 일종의 Git 센터다. 코드를 작성할 때는 "Changes" 뷰에서 많은 시간을 쓸 것이고 다른 동료가 커밋한 코드를 내려받을 때는 "Unsynced Commits"이나 "Branches" 뷰를 사용하게 된다. - -[[vs_home]] -////////////////////////// -.The "Home" view for a Git repository in Visual Studio. -image::images/vs-2.png[The Home view for a Git repository in Visual Studio.] -////////////////////////// -.Visual Studio의 Git 센터 "Home" 뷰. -image::images/vs-2.png[Visual Studio의 Git 센터 Home 뷰.] +* Create or clone a repository. +* Open and browse history of a repository. +* Create and checkout branches and tags. +* Stash, stage, and commit changes. +* Fetch, pull, push, or sync commits. +* Merge and rebase branches. +* Resolve merge conflicts. +* View diffs. +* ... and more! +////////////////////////// +* Git 저장소를 생성하거나 Clone 하기 +* Git 저장소를 열어 History를 조회하기 +* 브랜치나 태그를 생성하고 Checkout(Switch)하기 +* 변경사항을 Stash, Stage, 커밋 하기 +* 커밋들을 Fetch, Pull, Push, Sync 하기 +* 브랜치를 Merge 하거나 Rebase 하기 +* Merge 충돌을 해결하기 +* Diff 내용 보기 +* ... 기타 등등! ////////////////////////// -Visual Studio now has a powerful task-focused UI for Git. -It includes a linear history view, a diff viewer, remote commands, and many other capabilities. -For complete documentation of this feature (which doesn't fit here), go to http://msdn.microsoft.com/en-us/library/hh850437.aspx[]. +Read the https://docs.microsoft.com/visualstudio/version-control[official documentation^] to learn more. ////////////////////////// -Visual Studio에는 Git과 연동되는 Task-focused UI도 있다. -여기에는 히스토리 뷰, Diff 뷰어, 리모트 명령어 등등의 기능이 포함된다. -이 기능에 대한 자세한 문서는 http://msdn.microsoft.com/en-us/library/hh850437.aspx[]에 있다. +https://docs.microsoft.com/visualstudio/version-control[공식 문서^]를 확인한다면 자세한 내용을 더 알아볼 수 있다. diff --git a/book/A-git-in-other-environments/sections/visualstudiocode.asc b/book/A-git-in-other-environments/sections/visualstudiocode.asc new file mode 100644 index 00000000..e7c12fd1 --- /dev/null +++ b/book/A-git-in-other-environments/sections/visualstudiocode.asc @@ -0,0 +1,48 @@ +////////////////////////// +=== 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. +////////////////////////// +Visual Studio Code는 Git을 지원하는 기능이 포함되어 있다. +Git 버전 2.0.0 이상이 설치되어 있다면 VSCode는 Git을 이용할 수 있다. + +////////////////////////// +The main features are: +////////////////////////// +주요 기능은 다음과 같다: + +////////////////////////// +* See the diff of the file you are editing in the gutter. +* The Git Status Bar (lower left) shows the current branch, dirty indicators, incoming and outgoing commits. +* You can do the most common git operations from within the editor: +** Initialize a repository. +** Clone a repository. +** Create branches and tags. +** Stage and commit changes. +** Push/pull/sync with a remote branch. +** Resolve merge conflicts. +** View diffs. +* With an extension, you can also handle GitHub Pull Requests: + https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github[]. +////////////////////////// +* 파일 편집시 Gutter 부분을 통해 현재 파일의 수정한 부분을 확인할 수 있다. +* Git 상태표시줄(창 아래 왼쪽 부분)은 현재 선택한 브랜치, 저장소의 수정한 상태, 리모트 브랜치와의 커밋 비교 등을 표시한다. +* VSCode 편집기 화면 안에서 대부분의 주요 Git 관련 기능을 실행할 수 있다. +** 저장소를 새로 생성하고 초기화하기 +** 저장소를 Clone 하기 +** 브랜치나 태그를 생성하기 +** 변경사항을 Stash하거나 커밋하기 +** Push/Pull/Fetch 등 리모트 저장소와 동기화 하기 +** 병합(Merge) 충돌을 해결하기 +** Diff를 보기 +* 확장기능(Extension)을 통해 GtiHub 풀리퀘스트 기능도 VSCode 내에서 처리할 수 있다. + https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github[] 참고. + +////////////////////////// +The official documentation can be found here: https://code.visualstudio.com/Docs/editor/versioncontrol[]. +////////////////////////// +공식 문서는 https://code.visualstudio.com/Docs/editor/versioncontrol[] 에서 확인할 수 있다. diff --git a/book/A-git-in-other-environments/sections/zsh.asc b/book/A-git-in-other-environments/sections/zsh.asc index 19ae9bb6..d01476d0 100644 --- a/book/A-git-in-other-environments/sections/zsh.asc +++ b/book/A-git-in-other-environments/sections/zsh.asc @@ -51,34 +51,32 @@ zstyle ':vcs_info:git:*' formats '%b' ////////////////////////// This results in a display of the current branch on the right-hand side of the terminal window, whenever your shell is inside a Git repository. -(The left side is supported as well, of course; just uncomment the assignment to PROMPT.) +The left side is supported as well, of course; just uncomment the assignment to PROMPT. It looks a bit like this: ////////////////////////// 쉘에서 Git 저장소 디렉토리로 이동하면 터미널 오른쪽에 현 브랜치 이름을 아래와 같이 보여준다. -(물론 주석 처리한 것만 돌리면 왼쪽 프롬프트에서도 잘 된다.) +물론 주석 처리한 부분을 주석을 제거하여 실행되도록 하면 왼쪽 프롬프트에서도 잘 된다. ////////////////////////// -.Customized `zsh` prompt. -image::images/zsh-prompt.png[Customized `zsh` prompt.] +.Customized `zsh` prompt +image::images/zsh-prompt.png[Customized `zsh` prompt] ////////////////////////// -.`zsh` 프롬프트 설정. -image::images/zsh-prompt.png[`zsh` 프롬프트 설정.] +.`zsh` 프롬프트 설정 +image::images/zsh-prompt.png[`zsh` 프롬프트 설정] ////////////////////////// -For more information on vcs_info, check out its documentation - in the `zshcontrib(1)` manual page, - or online at http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#Version-Control-Information[]. +For more information on `vcs_info`, check out its documentation in the `zshcontrib(1)` manual page, or online at http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#Version-Control-Information[]. ////////////////////////// -vcs_info에 대한 자세한 정보는 `zshcontrib(1)` 메뉴얼 페이지를 보거나 -http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#Version-Control-Information[]에서 확인한다. +`vcs_info` 에 대한 자세한 정보는 `zshcontrib(1)` 메뉴얼 페이지를 보거나 +http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#Version-Control-Information[] 에서 확인한다. ////////////////////////// -Instead of vcs_info, you might prefer the prompt customization script that ships with Git, called `git-prompt.sh`; see https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh[] for details. +Instead of `vcs_info`, you might prefer the prompt customization script that ships with Git, called `git-prompt.sh`; see https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh[] for details. `git-prompt.sh` is compatible with both Bash and Zsh. ////////////////////////// -vcs_info말고 Git에 들어 있는 `git-prompt.sh` 를 직접 수정해서 사용해도 된다. 자세한 내용은 https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh[]에서 확인한다. -`git-prompt.sh` 는 Bash와 Zsh 모두 호환된다. +`vcs_info` 대신 Git에 들어 있는 `git-prompt.sh` 를 직접 수정해서 사용해도 된다. 자세한 내용은 https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh[] 에서 확인한다. +`git-prompt.sh` 는 Bash와 Zsh 모두에서 사용 가능하다. ////////////////////////// Zsh is powerful enough that there are entire frameworks dedicated to making it better. @@ -93,8 +91,8 @@ Git 탭 자동완성도 "oh-my-zsh" 플러그인을 사용하면 되고 브랜 [[oh_my_zsh_git]] ////////////////////////// -.An example of an oh-my-zsh theme. -image::images/zsh-oh-my.png[An example of an oh-my-zsh theme.] +.An example of an oh-my-zsh theme +image::images/zsh-oh-my.png[An example of an oh-my-zsh theme] ////////////////////////// -.oh-my-zsh 테마. -image::images/zsh-oh-my.png[oh-my-zsh 테마.] +.oh-my-zsh 테마 +image::images/zsh-oh-my.png[oh-my-zsh 테마] diff --git a/callouts/1.png b/callouts/1.png old mode 100755 new mode 100644 diff --git a/callouts/10.png b/callouts/10.png old mode 100755 new mode 100644 diff --git a/callouts/2.png b/callouts/2.png old mode 100755 new mode 100644 diff --git a/callouts/3.png b/callouts/3.png old mode 100755 new mode 100644 diff --git a/callouts/4.png b/callouts/4.png old mode 100755 new mode 100644 diff --git a/callouts/5.png b/callouts/5.png old mode 100755 new mode 100644 diff --git a/callouts/6.png b/callouts/6.png old mode 100755 new mode 100644 diff --git a/callouts/7.png b/callouts/7.png old mode 100755 new mode 100644 diff --git a/callouts/8.png b/callouts/8.png old mode 100755 new mode 100644 diff --git a/callouts/9.png b/callouts/9.png old mode 100755 new mode 100644 diff --git a/diagram-source/progit.sketch b/diagram-source/progit.sketch index d866bbe6..4aa4eab8 100644 Binary files a/diagram-source/progit.sketch and b/diagram-source/progit.sketch differ diff --git a/images/2fa-1.png b/images/2fa-1.png index 5abd7437..02725b9e 100644 Binary files a/images/2fa-1.png and b/images/2fa-1.png differ diff --git a/images/advance-master.png b/images/advance-master.png index c3a7ebe6..44aa8de6 100644 Binary files a/images/advance-master.png and b/images/advance-master.png differ diff --git a/images/advance-master.svg b/images/advance-master.svg new file mode 100644 index 00000000..4fede8f4 --- /dev/null +++ b/images/advance-master.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + images/advance-master + + + + images/advance-master + Created with Sketch. + + + + + + + + + + f30ab + + + + 34ac2 + + + + 98ca9 + + + + 87ab2 + + + + c2b9e + + + + + + + testing + + + + + + + master + + + + + HEAD + + + diff --git a/images/advance-testing.png b/images/advance-testing.png index 312e65e1..82e07c09 100644 Binary files a/images/advance-testing.png and b/images/advance-testing.png differ diff --git a/images/advance-testing.svg b/images/advance-testing.svg new file mode 100644 index 00000000..2a061b12 --- /dev/null +++ b/images/advance-testing.svg @@ -0,0 +1,52 @@ + + + + + + image/svg+xml + + images/advance-testing + + + + images/advance-testing + Created with Sketch. + + + + + + + + + master + + + + + f30ab + + + + 87ab2 + + + + 34ac2 + + + + 98ca9 + + + + + + testing + + + + + HEAD + + diff --git a/images/areas.png b/images/areas.png index da98fb03..94b77a1e 100644 Binary files a/images/areas.png and b/images/areas.png differ diff --git a/images/areas.svg b/images/areas.svg new file mode 100644 index 00000000..c7840b10 --- /dev/null +++ b/images/areas.svg @@ -0,0 +1,53 @@ + + + + + + image/svg+xml + + images/areas + + + + images/areas + Created with Sketch. + + + + + + + + + + + + StagingArea + + + + + .git directory(Repository) + + + + Checkout the project + + + + Stage Fixes + + + + Commit + + + + + + WorkingTree + + + + + diff --git a/images/basic-branching-1.png b/images/basic-branching-1.png index acc3866f..c6c6a38b 100644 Binary files a/images/basic-branching-1.png and b/images/basic-branching-1.png differ diff --git a/images/basic-branching-1.svg b/images/basic-branching-1.svg new file mode 100644 index 00000000..d977cfbf --- /dev/null +++ b/images/basic-branching-1.svg @@ -0,0 +1,36 @@ + + + + + + image/svg+xml + + images/basic-branching-1 + + + + + images/basic-branching-1 + Created with Sketch. + + + C0 + + + + + + C1 + + + + C2 + + + + + + master + + + diff --git a/images/basic-branching-2.png b/images/basic-branching-2.png index c3f14914..8b7ff3c4 100644 Binary files a/images/basic-branching-2.png and b/images/basic-branching-2.png differ diff --git a/images/basic-branching-2.svg b/images/basic-branching-2.svg new file mode 100644 index 00000000..6de51057 --- /dev/null +++ b/images/basic-branching-2.svg @@ -0,0 +1,41 @@ + + + + + + image/svg+xml + + images/basic-branching-2 + + + + + images/basic-branching-2 + Created with Sketch. + + + + C0 + + + + + + + + C1 + + + + C2 + + + + master + + + + iss53 + + + diff --git a/images/basic-branching-3.png b/images/basic-branching-3.png index ebc9ca95..f4df8ce4 100644 Binary files a/images/basic-branching-3.png and b/images/basic-branching-3.png differ diff --git a/images/basic-branching-3.svg b/images/basic-branching-3.svg new file mode 100644 index 00000000..0192c1b4 --- /dev/null +++ b/images/basic-branching-3.svg @@ -0,0 +1,50 @@ + + + + + + image/svg+xml + + images/basic-branching-3 + + + + + images/basic-branching-3 + Created with Sketch. + + + + + + + + + C0 + + + + C1 + + + + C2 + + + + C3 + + + + + master + + + + + + iss53 + + + + diff --git a/images/basic-branching-4.png b/images/basic-branching-4.png index ab8f2228..e81d5636 100644 Binary files a/images/basic-branching-4.png and b/images/basic-branching-4.png differ diff --git a/images/basic-branching-4.svg b/images/basic-branching-4.svg new file mode 100644 index 00000000..59691bd2 --- /dev/null +++ b/images/basic-branching-4.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + images/basic-branching-4 + + + + + images/basic-branching-4 + Created with Sketch. + + + + + + + + + + C0 + + + + C1 + + + + C2 + + + + + master + + + + + + + hotfix + + + + + C4 + + + + C3 + + + + + iss53 + + + + + + diff --git a/images/basic-branching-5.png b/images/basic-branching-5.png index 947133f7..269dbdd1 100644 Binary files a/images/basic-branching-5.png and b/images/basic-branching-5.png differ diff --git a/images/basic-branching-5.svg b/images/basic-branching-5.svg new file mode 100644 index 00000000..d3d8e87d --- /dev/null +++ b/images/basic-branching-5.svg @@ -0,0 +1,62 @@ + + + + + + image/svg+xml + + images/basic-branching-5 + + + + + images/basic-branching-5 + Created with Sketch. + + + + + + + C0 + + + + C1 + + + + C2 + + + + + master + + + + + + + hotfix + + + + + C4 + + + + + C3 + + + + + + + iss53 + + + + diff --git a/images/basic-branching-6.png b/images/basic-branching-6.png index 6023d694..1e5a1c0c 100644 Binary files a/images/basic-branching-6.png and b/images/basic-branching-6.png differ diff --git a/images/basic-branching-6.svg b/images/basic-branching-6.svg new file mode 100644 index 00000000..feaf578a --- /dev/null +++ b/images/basic-branching-6.svg @@ -0,0 +1,66 @@ + + + + + + image/svg+xml + + images/basic-branching-6 + + + + + images/basic-branching-6 + Created with Sketch. + + + + + C0 + + + + C1 + + + + C2 + + + + + + + + + + + + master + + + + + C4 + + + + + + C5 + + + + + C3 + + + + + + iss53 + + + + + diff --git a/images/basic-merging-1.png b/images/basic-merging-1.png index e1bcc27f..82a7148e 100644 Binary files a/images/basic-merging-1.png and b/images/basic-merging-1.png differ diff --git a/images/basic-merging-1.svg b/images/basic-merging-1.svg new file mode 100644 index 00000000..012bc1d4 --- /dev/null +++ b/images/basic-merging-1.svg @@ -0,0 +1,63 @@ + + + + + + image/svg+xml + + images/basic-merging-1 + + + + + images/basic-merging-1 + Created with Sketch. + + + + + + + + C0 + + + + C1 + + + + C2 + + + + + + master + + Snapshot toMerge Into + + + C4 + + + + + C5 + + + + C3 + + + + + + iss53 + + + Common Ancestor + Snapshot toMerge In + + + diff --git a/images/basic-merging-2.png b/images/basic-merging-2.png index a2438266..d60f4662 100644 Binary files a/images/basic-merging-2.png and b/images/basic-merging-2.png differ diff --git a/images/basic-merging-2.svg b/images/basic-merging-2.svg new file mode 100644 index 00000000..856d1435 --- /dev/null +++ b/images/basic-merging-2.svg @@ -0,0 +1,68 @@ + + + + + + image/svg+xml + + images/basic-merging-2 + + + + + images/basic-merging-2 + Created with Sketch. + + + + + + + C0 + + + + C1 + + + + C2 + + + + + + + master + + + + + C4 + + + + + + C5 + + + + + + + C6 + + + + C3 + + + + + + iss53 + + + + diff --git a/images/basic-rebase-1.png b/images/basic-rebase-1.png index 44ea49e3..e9494b0f 100644 Binary files a/images/basic-rebase-1.png and b/images/basic-rebase-1.png differ diff --git a/images/basic-rebase-1.svg b/images/basic-rebase-1.svg new file mode 100644 index 00000000..111bbf0d --- /dev/null +++ b/images/basic-rebase-1.svg @@ -0,0 +1,57 @@ + + + + + + image/svg+xml + + images/basic-rebase-1 + + + + + images/basic-rebase-1 + Created with Sketch. + + + + + + + C0 + + + + C1 + + + + C2 + + + + + + + experiment + + + + + + C4 + + + + C3 + + + + + + + master + + + + diff --git a/images/basic-rebase-2.png b/images/basic-rebase-2.png index c82140cd..efb9bc4c 100644 Binary files a/images/basic-rebase-2.png and b/images/basic-rebase-2.png differ diff --git a/images/basic-rebase-2.svg b/images/basic-rebase-2.svg new file mode 100644 index 00000000..6c108519 --- /dev/null +++ b/images/basic-rebase-2.svg @@ -0,0 +1,63 @@ + + + + + + image/svg+xml + + images/basic-rebase-2 + + + + + images/basic-rebase-2 + Created with Sketch. + + + + + + C0 + + + + C1 + + + + C2 + + + + + + + + experiment + + + + + C4 + + + + + + C3 + + + + + + C5 + + + + + + master + + + + diff --git a/images/basic-rebase-3.png b/images/basic-rebase-3.png index a1afaef6..846aebcc 100644 Binary files a/images/basic-rebase-3.png and b/images/basic-rebase-3.png differ diff --git a/images/basic-rebase-3.svg b/images/basic-rebase-3.svg new file mode 100644 index 00000000..9bb11f9a --- /dev/null +++ b/images/basic-rebase-3.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + images/basic-rebase-3 + + + + + images/basic-rebase-3 + Created with Sketch. + + + + + + C0 + + + + C1 + + + + C2 + + + + + + experiment + + + + + + + C4 + + + + + + + C3 + + + + + + C4' + + + + + + master + + + + diff --git a/images/basic-rebase-4.png b/images/basic-rebase-4.png index e97c1685..ea75fce3 100644 Binary files a/images/basic-rebase-4.png and b/images/basic-rebase-4.png differ diff --git a/images/basic-rebase-4.svg b/images/basic-rebase-4.svg new file mode 100644 index 00000000..f7ce55ae --- /dev/null +++ b/images/basic-rebase-4.svg @@ -0,0 +1,57 @@ + + + + + + image/svg+xml + + images/basic-rebase-4 + + + + + images/basic-rebase-4 + Created with Sketch. + + + + + + C0 + + + + C1 + + + + C2 + + + + + + experiment + + + + + + + C3 + + + + + + C4' + + + + + + master + + + + diff --git a/images/benevolent-dictator.png b/images/benevolent-dictator.png index aeb47e7c..3f89db8a 100644 Binary files a/images/benevolent-dictator.png and b/images/benevolent-dictator.png differ diff --git a/images/benevolent-dictator.svg b/images/benevolent-dictator.svg new file mode 100644 index 00000000..a70712c1 --- /dev/null +++ b/images/benevolent-dictator.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + images/benevolent-dictator + + + + + images/benevolent-dictator + Created with Sketch. + + + + + + + + lieutenant + + + + + + + lieutenant + + + + + + developerpublic + + + + + + + + + + + dictator + + + + developerpublic + + + + developerpublic + + + + + + blessedrepository + + + + diff --git a/images/bitnami.png b/images/bitnami.png deleted file mode 100644 index 9852e727..00000000 Binary files a/images/bitnami.png and /dev/null differ diff --git a/images/branch-and-history.png b/images/branch-and-history.png index 2b4ab17e..71bd27c0 100644 Binary files a/images/branch-and-history.png and b/images/branch-and-history.png differ diff --git a/images/branch-and-history.svg b/images/branch-and-history.svg new file mode 100644 index 00000000..2996565e --- /dev/null +++ b/images/branch-and-history.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + images/branch-and-history + + + + + images/branch-and-history + Created with Sketch. + + + + + Snapshot C + + + + + Snapshot B + + + + + Snapshot A + + + + f30ab + + + + + + + 34ac2 + + + + 98ca9 + + + + + + master + + + + HEAD + + + + v1.0 + + + diff --git a/images/centralized.png b/images/centralized.png index 9aa3e902..4cdaca13 100644 Binary files a/images/centralized.png and b/images/centralized.png differ diff --git a/images/centralized.svg b/images/centralized.svg new file mode 100644 index 00000000..b5583f1c --- /dev/null +++ b/images/centralized.svg @@ -0,0 +1,39 @@ + + + + + + image/svg+xml + + images/centralized + + + + images/centralized + Created with Sketch. + + + + + developer + + + + developer + + + + developer + + + + + + + + sharedrepository + + + + + diff --git a/images/checkout-master.png b/images/checkout-master.png index 06e98787..a133f42a 100644 Binary files a/images/checkout-master.png and b/images/checkout-master.png differ diff --git a/images/checkout-master.svg b/images/checkout-master.svg new file mode 100644 index 00000000..04a1a20a --- /dev/null +++ b/images/checkout-master.svg @@ -0,0 +1,53 @@ + + + + + + image/svg+xml + + images/checkout-master + + + + + images/checkout-master + Created with Sketch. + + + + + + + + + master + + + + f30ab + + + + 87ab2 + + + + 34ac2 + + + + 98ca9 + + + + + testing + + + + + HEAD + + + + diff --git a/images/clean.png b/images/clean.png index ec8fcaa5..677a8c5b 100644 Binary files a/images/clean.png and b/images/clean.png differ diff --git a/images/clean.svg b/images/clean.svg new file mode 100644 index 00000000..7683b330 --- /dev/null +++ b/images/clean.svg @@ -0,0 +1,282 @@ + + + + + + + image/svg+xml + + images/clean + + + + + images/clean + Created with Sketch. + + + + + + + fileA.txt + + + + + + + fileA.txt' + + + + + + fileB.txt' + + + + + + fileB.txt + + + + + + fileC.rb + + + + + + fileC.rb + + + + Staging Area + + + Working Directory + + + *.txt Filter + + + + + smudge + + + + + + clean + + + + + + + + + + + diff --git a/images/commit-and-tree.png b/images/commit-and-tree.png index 3ddf1cd5..e840e891 100644 Binary files a/images/commit-and-tree.png and b/images/commit-and-tree.png differ diff --git a/images/commit-and-tree.svg b/images/commit-and-tree.svg new file mode 100644 index 00000000..3c3112b8 --- /dev/null +++ b/images/commit-and-tree.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + images/commit-and-tree + + + + + images/commit-and-tree + Created with Sketch. + + + + + size 5b1d3 README 911e7 LICENSE cba0a test.rb + treeblobblobblob + + + + The initial commit of my project + + size 92ec2 Scott Scott + committreeauthorcommitter + + 98ca9 + + 92ec2 + + + size + blob + == Testing library This library is used to test Ruby projects. + 5b1d3 + + + + size + blob + The MIT License Copyright (c) 2008 Scott Chacon Permission is hereby granted, free of charge, to any person + 911e7 + + + + size + blob + require 'logger' require 'test/unit' class Test::Unit::TestCase + cba0a + + + + + + + + + + diff --git a/images/commits-and-parents.png b/images/commits-and-parents.png index d5639726..399b2d00 100644 Binary files a/images/commits-and-parents.png and b/images/commits-and-parents.png differ diff --git a/images/commits-and-parents.svg b/images/commits-and-parents.svg new file mode 100644 index 00000000..ee786daa --- /dev/null +++ b/images/commits-and-parents.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + images/commits-and-parents + + + + + images/commits-and-parents + Created with Sketch. + + + Snapshot A + + + + Snapshot B + + + 98ca9 + 34ac2 + + + + Snapshot C + + + f30ab + + + + Fixed bug #1328 - stack overflow under certain conditions + + size 184ca 98ca9 Scott Scott + committreeparentauthorcommitter + + + + + The initial commit of my project + + size 92ec2 Scott Scott + committreeparentauthorcommitter + + + + + add feature #32 - ability to add new formats to the central interface + + size 0de24 34ac2 Scott Scott + committreeparentauthorcommitter + + + + diff --git a/images/data-model-1.png b/images/data-model-1.png index 9331e915..410ff7db 100644 Binary files a/images/data-model-1.png and b/images/data-model-1.png differ diff --git a/images/data-model-1.svg b/images/data-model-1.svg new file mode 100644 index 00000000..5888cbe3 --- /dev/null +++ b/images/data-model-1.svg @@ -0,0 +1,57 @@ + + + + + + image/svg+xml + + images/data-model-1 + + + + + images/data-model-1 + Created with Sketch. + + + + blob + + + + blob + + + + blob + + + + + + + + simplegit.rb + + + + Rakefile + + + + README + + + + lib + + + + tree + + + + tree + + + diff --git a/images/data-model-2.png b/images/data-model-2.png index eb1d48e1..1d748727 100644 Binary files a/images/data-model-2.png and b/images/data-model-2.png differ diff --git a/images/data-model-2.svg b/images/data-model-2.svg new file mode 100644 index 00000000..a675500e --- /dev/null +++ b/images/data-model-2.svg @@ -0,0 +1,66 @@ + + + + + + image/svg+xml + + images/data-model-2 + + + + + images/data-model-2 + Created with Sketch. + + + + + "version 2" + 1f7a7a + + + + "new file" + fa49b0 + + + + "version 1" + 83baae + + + + + + + + test.txt + + + + test.txt + + + + new.txt + + + + bak + + + + + tree + 3c4e9c + + + + + tree + d8329f + + + + diff --git a/images/data-model-3.png b/images/data-model-3.png index 317acbb0..5aa0edef 100644 Binary files a/images/data-model-3.png and b/images/data-model-3.png differ diff --git a/images/data-model-3.svg b/images/data-model-3.svg new file mode 100644 index 00000000..0f03b451 --- /dev/null +++ b/images/data-model-3.svg @@ -0,0 +1,97 @@ + + + + + + image/svg+xml + + images/data-model-3 + + + + + images/data-model-3 + Created with Sketch. + + + + + + + + + + + + + "version 2" + 1f7a7a + + + + "new file" + fa49b0 + + + + "version 1" + 83baae + + + + test.txt + + + + test.txt + + + + test.txt + + + + new.txt + + + + new.txt + + + + bak + + + + tree + 3c4e9c + + + + third commit + 1a410e + + + + + second commit + cac0ca + + + + + first commit + fdf4fc + + + + tree + 0155eb + + + + tree + d8329f + + + diff --git a/images/data-model-4.png b/images/data-model-4.png index 38136440..98cc08a1 100644 Binary files a/images/data-model-4.png and b/images/data-model-4.png differ diff --git a/images/data-model-4.svg b/images/data-model-4.svg new file mode 100644 index 00000000..05b8bd8b --- /dev/null +++ b/images/data-model-4.svg @@ -0,0 +1,111 @@ + + + + + + image/svg+xml + + images/data-model-4 + + + + + images/data-model-4 + Created with Sketch. + + + + + + + + + + + + + "version 2" + 1f7a7a + + + + "new file" + fa49b0 + + + + "version 1" + 83baae + + + + test.txt + + + + test.txt + + + + test.txt + + + + new.txt + + + + new.txt + + + + bak + + + + tree + 3c4e9c + + + + third commit + 1a410e + + + + + second commit + cac0ca + + + + + first commit + fdf4fc + + + + + + refs/heads/test + + + + + + + refs/heads/master + + + + + tree + 0155eb + + + + tree + d8329f + + + diff --git a/images/deltas.png b/images/deltas.png index 47904edb..0ea5684c 100644 Binary files a/images/deltas.png and b/images/deltas.png differ diff --git a/images/deltas.svg b/images/deltas.svg new file mode 100644 index 00000000..9dc3a541 --- /dev/null +++ b/images/deltas.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + images/deltas + + + + images/deltas + Created with Sketch. + + + Version 1 + + Version 2 + + Version 3 + + Version 4 + + Version 5 + + + File A + + + File A + + Δ1 + + Δ1 + + Δ2 + + Δ1 + + Δ2 + + Δ2 + + Δ3 + + File B + + File C + + + + + + + + + + + + Checkins Over Time + diff --git a/images/distributed.png b/images/distributed.png index 53cfcaeb..83466743 100644 Binary files a/images/distributed.png and b/images/distributed.png differ diff --git a/images/distributed.svg b/images/distributed.svg new file mode 100644 index 00000000..072dc470 --- /dev/null +++ b/images/distributed.svg @@ -0,0 +1,99 @@ + + + + + + image/svg+xml + + images/distributed + + + + images/distributed + Created with Sketch. + + + + Version Database + + + + + Version 3 + + + + Version 2 + + + + Version 1 + + + + + + Server Computer + + + Version Database + + + + + Version 3 + + + + Version 2 + + + + Version 1 + + + + + + + Computer A + + + File + + + + + + Version Database + + + + + Version 3 + + + + Version 2 + + + + Version 1 + + + + + + + Computer B + + + File + + + + + + + + diff --git a/images/double-dot.png b/images/double-dot.png index 53175c15..0f50ff5b 100644 Binary files a/images/double-dot.png and b/images/double-dot.png differ diff --git a/images/double-dot.svg b/images/double-dot.svg new file mode 100644 index 00000000..465b050e --- /dev/null +++ b/images/double-dot.svg @@ -0,0 +1,330 @@ + + + + + + image/svg+xml + + images/double-dot + + + + + + + + + images/double-dot + Created with Sketch. + + + + + A + + + + + + + + B + + + + + + + + + E + + + + + + + + + + F + + + + + + + + + C + + + + + + + + + D + + + + + + + + + master + + + + + + + + + experiment + + + + + diff --git a/images/egit.png b/images/egit.png deleted file mode 100644 index 27a7011a..00000000 Binary files a/images/egit.png and /dev/null differ diff --git a/images/emoji.png b/images/emoji.png deleted file mode 100644 index 42b01fb0..00000000 Binary files a/images/emoji.png and /dev/null differ diff --git a/images/git-tfs-ct.png b/images/git-tfs-ct.png deleted file mode 100644 index d081f272..00000000 Binary files a/images/git-tfs-ct.png and /dev/null differ diff --git a/images/head-to-master.png b/images/head-to-master.png index 86c7ae85..cc6a65b9 100644 Binary files a/images/head-to-master.png and b/images/head-to-master.png differ diff --git a/images/head-to-master.svg b/images/head-to-master.svg new file mode 100644 index 00000000..285833a8 --- /dev/null +++ b/images/head-to-master.svg @@ -0,0 +1,46 @@ + + + + + + image/svg+xml + + images/head-to-master + + + + + images/head-to-master + Created with Sketch. + + + + + + + + + master + + + + testing + + + + f30ab + + + + 34ac2 + + + + 98ca9 + + + + HEAD + + + diff --git a/images/head-to-testing.png b/images/head-to-testing.png index 08352d60..6b329fdd 100644 Binary files a/images/head-to-testing.png and b/images/head-to-testing.png differ diff --git a/images/head-to-testing.svg b/images/head-to-testing.svg new file mode 100644 index 00000000..0ea2c506 --- /dev/null +++ b/images/head-to-testing.svg @@ -0,0 +1,46 @@ + + + + + + image/svg+xml + + images/head-to-testing + + + + + images/head-to-testing + Created with Sketch. + + + + + + + + master + + + + testing + + + + f30ab + + + + 34ac2 + + + + 98ca9 + + + + + HEAD + + + diff --git a/images/integration-manager.png b/images/integration-manager.png index fd0d531e..d5432179 100644 Binary files a/images/integration-manager.png and b/images/integration-manager.png differ diff --git a/images/integration-manager.svg b/images/integration-manager.svg new file mode 100644 index 00000000..2661c070 --- /dev/null +++ b/images/integration-manager.svg @@ -0,0 +1,56 @@ + + + + + + image/svg+xml + + images/integration-manager + + + + + images/integration-manager + Created with Sketch. + + + + + + developer public + + + + developer private + + + + + + + + + + + + + blessedrepository + + + + integrationmanager + + + + developerpublic + + + + developerpublic + + developerprivate + developerprivate + + + + diff --git a/images/interesting-rebase-1.png b/images/interesting-rebase-1.png index ed58a06c..ac53ee0c 100644 Binary files a/images/interesting-rebase-1.png and b/images/interesting-rebase-1.png differ diff --git a/images/interesting-rebase-1.svg b/images/interesting-rebase-1.svg new file mode 100644 index 00000000..5c520bf9 --- /dev/null +++ b/images/interesting-rebase-1.svg @@ -0,0 +1,98 @@ + + + + + + image/svg+xml + + images/interesting-rebase-1 + + + + + images/interesting-rebase-1 + Created with Sketch. + + + + C1 + + + + + + C2 + + + + + + + C5 + + + + + + + master + + + + + + + C6 + + + + + + + C3 + + + + + + + C4 + + + + + + + + + C8 + + + + + + + C9 + + + + + + + C10 + + + + + + + server + + + + + + client + + + diff --git a/images/interesting-rebase-2.png b/images/interesting-rebase-2.png index 95c30681..4984b898 100644 Binary files a/images/interesting-rebase-2.png and b/images/interesting-rebase-2.png differ diff --git a/images/interesting-rebase-2.svg b/images/interesting-rebase-2.svg new file mode 100644 index 00000000..fb5feecb --- /dev/null +++ b/images/interesting-rebase-2.svg @@ -0,0 +1,110 @@ + + + + + + image/svg+xml + + images/interesting-rebase-2 + + + + + images/interesting-rebase-2 + Created with Sketch. + + + + C1 + + + + + + C2 + + + + + + + C5 + + + + + + + master + + + + + + + C6 + + + + + + + C8' + + + + + + + C9' + + + + + + + C3 + + + + + + + C4 + + + + + + + C8 + + + + + C9 + + + + + + + C10 + + + + + + + server + + + + + + + client + + + + diff --git a/images/interesting-rebase-3.png b/images/interesting-rebase-3.png index 45aeeca2..c8a0bdc4 100644 Binary files a/images/interesting-rebase-3.png and b/images/interesting-rebase-3.png differ diff --git a/images/interesting-rebase-3.svg b/images/interesting-rebase-3.svg new file mode 100644 index 00000000..cb5e2e63 --- /dev/null +++ b/images/interesting-rebase-3.svg @@ -0,0 +1,92 @@ + + + + + + image/svg+xml + + images/interesting-rebase-3 + + + + + images/interesting-rebase-3 + Created with Sketch. + + + + C1 + + + + + + C2 + + + + + + + C5 + + + + + + + master + + + + + + + C6 + + + + + + + C8' + + + + + + C9' + + + + + C3 + + + + + + C4 + + + + + + C10 + + + + + + server + + + + + + + client + + + + diff --git a/images/interesting-rebase-4.png b/images/interesting-rebase-4.png index 44b6ca5f..e815f760 100644 Binary files a/images/interesting-rebase-4.png and b/images/interesting-rebase-4.png differ diff --git a/images/interesting-rebase-4.svg b/images/interesting-rebase-4.svg new file mode 100644 index 00000000..df0604b3 --- /dev/null +++ b/images/interesting-rebase-4.svg @@ -0,0 +1,109 @@ + + + + + + image/svg+xml + + images/interesting-rebase-4 + + + + + images/interesting-rebase-4 + Created with Sketch. + + + + C1 + + + + + + C2 + + + + + + + C5 + + + + + + + master + + + + + + + C6 + + + + + + C8' + + + + + C9' + + + + + C3' + + + + + + C4' + + + + + + C10' + + + + + + C3 + + + + + + C4 + + + + + + C10 + + + + + + + server + + + + + + + client + + + + diff --git a/images/interesting-rebase-5.png b/images/interesting-rebase-5.png index aa0745db..9ee451a5 100644 Binary files a/images/interesting-rebase-5.png and b/images/interesting-rebase-5.png differ diff --git a/images/interesting-rebase-5.svg b/images/interesting-rebase-5.svg new file mode 100644 index 00000000..18907ad9 --- /dev/null +++ b/images/interesting-rebase-5.svg @@ -0,0 +1,74 @@ + + + + + + image/svg+xml + + images/interesting-rebase-5 + + + + + images/interesting-rebase-5 + Created with Sketch. + + + + C1 + + + + + + C2 + + + + + + + C5 + + + + + + + master + + + + + + + C6 + + + + + C8' + + + + C9' + + + + + C3' + + + + + + C4' + + + + + + C10' + + + diff --git a/images/jb.png b/images/jb.png new file mode 100644 index 00000000..2ffe74a8 Binary files /dev/null and b/images/jb.png differ diff --git a/images/large-merges-1.png b/images/large-merges-1.png index d3ee025a..d043166a 100644 Binary files a/images/large-merges-1.png and b/images/large-merges-1.png differ diff --git a/images/large-merges-1.svg b/images/large-merges-1.svg new file mode 100644 index 00000000..534f8748 --- /dev/null +++ b/images/large-merges-1.svg @@ -0,0 +1,126 @@ + + + + + + image/svg+xml + + images/large-merges-1 + + + + + images/large-merges-1 + Created with Sketch. + + + + + master + + + + + + tv/rebase-stat + + + + + + + jk/clone-checkout + + + + + + + db/push-cleanup + + + + + + + js/notes + + + + + + + ps/blame + + + + + C1 + + + + + C2 + + + + + + + + + C3 + + + + C5 + + + + C7 + + + + C9 + + + + C11 + + + + + + C4 + + + + + + + C6 + + + + + + + C8 + + + + + + + C10 + + + + + + + C12 + + + + diff --git a/images/large-merges-2.png b/images/large-merges-2.png index 2d23e691..71b07b77 100644 Binary files a/images/large-merges-2.png and b/images/large-merges-2.png differ diff --git a/images/large-merges-2.svg b/images/large-merges-2.svg new file mode 100644 index 00000000..30288eca --- /dev/null +++ b/images/large-merges-2.svg @@ -0,0 +1,172 @@ + + + + + + image/svg+xml + + images/large-merges-2 + + + + + images/large-merges-2 + Created with Sketch. + + + + + + master + + + + + + + tv/rebase-stat + + + + + + + jk/clone-checkout + + + + + + + db/push-cleanup + + + + + + + js/notes + + + + + + + seen + + + + + + + next + + + + + + + ps/blame + + + + + C1 + + + + + C2 + + + + + + + + + + + + C3 + + + + C5 + + + + C7 + + + + C9 + + + + C11 + + + + + + C4 + + + + + + C16 + + + + + C17 + + + + + C13 + + + + + C14 + + + + + C15 + + + + + + C6 + + + + + + + C8 + + + + + + + C10 + + + + + + + C12 + + + + + + diff --git a/images/lifecycle.png b/images/lifecycle.png index 922b02c0..68bf3a4e 100644 Binary files a/images/lifecycle.png and b/images/lifecycle.png differ diff --git a/images/lifecycle.svg b/images/lifecycle.svg new file mode 100644 index 00000000..7e6ec6ab --- /dev/null +++ b/images/lifecycle.svg @@ -0,0 +1,49 @@ + + + + + + image/svg+xml + + images/lifecycle + + + + + images/lifecycle + Created with Sketch. + + + + + + + + + Modified + + + + + + + Edit the file + Add the file + Remove the file + Stage the file + + + Untracked + + + + Unmodified + + Commit + + + Staged + + + + diff --git a/images/local.png b/images/local.png index 1779acfb..067e27e6 100644 Binary files a/images/local.png and b/images/local.png differ diff --git a/images/local.svg b/images/local.svg new file mode 100644 index 00000000..dcc3a07a --- /dev/null +++ b/images/local.svg @@ -0,0 +1,44 @@ + + + + + + image/svg+xml + + images/local + + + + images/local + Created with Sketch. + + + + Local Computer + + Version Database + Checkout + + + File + + + + Version 3 + + + + Version 2 + + + + Version 1 + + + + + + + + + diff --git a/images/lr-branches-1.png b/images/lr-branches-1.png index ad7c9c9a..bafc6048 100644 Binary files a/images/lr-branches-1.png and b/images/lr-branches-1.png differ diff --git a/images/lr-branches-1.svg b/images/lr-branches-1.svg new file mode 100644 index 00000000..ad050292 --- /dev/null +++ b/images/lr-branches-1.svg @@ -0,0 +1,72 @@ + + + + + + image/svg+xml + + images/lr-branches-1 + + + + + images/lr-branches-1 + Created with Sketch. + + + + C1 + + + + + C2 + + + + + C3 + + + + + C4 + + + + + C5 + + + + + C6 + + + + + C7 + + + + + + master + + + + + + + develop + + + + + + + topic + + + + diff --git a/images/lr-branches-2.png b/images/lr-branches-2.png index 8db4bc08..bf8bdc05 100644 Binary files a/images/lr-branches-2.png and b/images/lr-branches-2.png differ diff --git a/images/lr-branches-2.svg b/images/lr-branches-2.svg new file mode 100644 index 00000000..cafaedde --- /dev/null +++ b/images/lr-branches-2.svg @@ -0,0 +1,65 @@ + + + + + + image/svg+xml + + images/lr-branches-2 + + + + + images/lr-branches-2 + Created with Sketch. + + + + + + + + + master + develop + topic + + + + + + C1 + + + + + + C2 + + + + + C3 + + + + + C4 + + + + + C5 + + + + + C6 + + + + C7 + + + + diff --git a/images/managed-team-1.png b/images/managed-team-1.png index 489b6322..e5525a79 100644 Binary files a/images/managed-team-1.png and b/images/managed-team-1.png differ diff --git a/images/managed-team-1.svg b/images/managed-team-1.svg new file mode 100644 index 00000000..12bffd39 --- /dev/null +++ b/images/managed-team-1.svg @@ -0,0 +1,56 @@ + + + + + + image/svg+xml + + images/managed-team-1 + + + + + images/managed-team-1 + Created with Sketch. + + + + 4b078 + + + + + 1edee + + + + + + 33009 + + + + + + 85127 + + + + + e5b0f + + + + + featureB + + + + + master + + + + featureA + + diff --git a/images/managed-team-2.png b/images/managed-team-2.png index 25c2db2b..725e7e9b 100644 Binary files a/images/managed-team-2.png and b/images/managed-team-2.png differ diff --git a/images/managed-team-2.svg b/images/managed-team-2.svg new file mode 100644 index 00000000..7318ac6a --- /dev/null +++ b/images/managed-team-2.svg @@ -0,0 +1,109 @@ + + + + + + image/svg+xml + + images/managed-team-2 + + + + + images/managed-team-2 + Created with Sketch. + + + + + 4b078 + + + + + 1edee + + + + + + 33009 + + + + + + + aad88 + + + + + + + 774b3 + + + + + + + 85127 + + + + + + cd685 + + + + + fba9a + + + + + e5b0f + + + + + + + + + + + featureB + + + + + + + master + + + + + + + + + + + + featureA + + + + + origin/featureA + + + + origin/featureBee + + + diff --git a/images/managed-team-3.png b/images/managed-team-3.png index a8a08a70..a20e9e3e 100644 Binary files a/images/managed-team-3.png and b/images/managed-team-3.png differ diff --git a/images/managed-team-3.svg b/images/managed-team-3.svg new file mode 100644 index 00000000..bb65880d --- /dev/null +++ b/images/managed-team-3.svg @@ -0,0 +1,116 @@ + + + + + + image/svg+xml + + images/managed-team-3 + + + + + images/managed-team-3 + Created with Sketch. + + + + + + 4b078 + + + + + 1edee + + + + + + 33009 + + + + + + + aad88 + + + + + + + 774b3 + + + + + + 5399e + + + + + + 85127 + + + + + + cd685 + + + + + fba9a + + + + + e5b0f + + + + + + + + + featureB + + + + + + + master + + + + + + + + + + featureA + + + origin/featureBee + + + + origin/featureA + + + + + + + + origin/master + + diff --git a/images/managed-team-flow.png b/images/managed-team-flow.png index 6d83ac4d..7593cdaf 100644 Binary files a/images/managed-team-flow.png and b/images/managed-team-flow.png differ diff --git a/images/managed-team-flow.svg b/images/managed-team-flow.svg new file mode 100644 index 00000000..6bddb3ef --- /dev/null +++ b/images/managed-team-flow.svg @@ -0,0 +1,587 @@ + + + + + + + + image/svg+xml + + images/managed-team-flow + + + + + images/managed-team-flow + Created with Sketch. + + + + + Josie + + + + + + + Josie + + + + + + John + + + + + + + John + + + + + + Jessica + + + + + + + Jessica + + + + + + + git commit + (A) + + + git commit + (B) + + + git fetch origin + + + + git fetch origin + + + + git fetch origin + + + git push origin featureA + + + + git push origin featureA + + + + git push origin featureA + + + + git push origin featureBee + + + + git push origin featureB:featureBee + + + + + git commit + (A) + + + + git commit + (B) + + + + + git merge + (B) + + + + git merge + (A) + + + + git commit + (A) + + + + git merge + (A) + + + + + server:featureA + + + + server:featureBee + + + + server:featureA + + + + server:featureBee + + + diff --git a/images/merging-workflows-1.png b/images/merging-workflows-1.png index 461de6e2..1149352f 100644 Binary files a/images/merging-workflows-1.png and b/images/merging-workflows-1.png differ diff --git a/images/merging-workflows-1.svg b/images/merging-workflows-1.svg new file mode 100644 index 00000000..622cb69b --- /dev/null +++ b/images/merging-workflows-1.svg @@ -0,0 +1,84 @@ + + + + + + image/svg+xml + + images/merging-workflows-1 + + + + + images/merging-workflows-1 + Created with Sketch. + + + + + C1 + + + + + + + C2 + + + + + + C7 + + + + + + C3 + + + + + + + C4 + + + + + + + C5 + + + + + + + C6 + + + + + + + master + + + + + + + ruby_client + + + + + + + php_client + + + + diff --git a/images/merging-workflows-2.png b/images/merging-workflows-2.png index 5a0d1fcf..fc6bc771 100644 Binary files a/images/merging-workflows-2.png and b/images/merging-workflows-2.png differ diff --git a/images/merging-workflows-2.svg b/images/merging-workflows-2.svg new file mode 100644 index 00000000..a96571ce --- /dev/null +++ b/images/merging-workflows-2.svg @@ -0,0 +1,100 @@ + + + + + + image/svg+xml + + images/merging-workflows-2 + + + + + images/merging-workflows-2 + Created with Sketch. + + + + + C1 + + + + + + + C2 + + + + + + + C7 + + + + + + + C3 + + + + + + + C4 + + + + + + + + C9 + + + + + + + + C8 + + + + + + + C5 + + + + + + + C6 + + + + + + + master + + + + + + + ruby_client + + + + + php_client + + + + diff --git a/images/merging-workflows-3.png b/images/merging-workflows-3.png index f3a32367..4e585001 100644 Binary files a/images/merging-workflows-3.png and b/images/merging-workflows-3.png differ diff --git a/images/merging-workflows-3.svg b/images/merging-workflows-3.svg new file mode 100644 index 00000000..4d96149b --- /dev/null +++ b/images/merging-workflows-3.svg @@ -0,0 +1,66 @@ + + + + + + image/svg+xml + + images/merging-workflows-3 + + + + + images/merging-workflows-3 + Created with Sketch. + + + + + C1 + + + + + + C2 + + + + + C5 + + + + + + C3 + + + + + + C4 + + + + + + develop + + + + + + + master + + + + + + + ruby_client + + + + diff --git a/images/merging-workflows-4.png b/images/merging-workflows-4.png index 2ad04c13..dc611a6a 100644 Binary files a/images/merging-workflows-4.png and b/images/merging-workflows-4.png differ diff --git a/images/merging-workflows-4.svg b/images/merging-workflows-4.svg new file mode 100644 index 00000000..03d27b90 --- /dev/null +++ b/images/merging-workflows-4.svg @@ -0,0 +1,74 @@ + + + + + + image/svg+xml + + images/merging-workflows-4 + + + + + images/merging-workflows-4 + Created with Sketch. + + + + + C1 + + + + + + C2 + + + + + C5 + + + + + + C3 + + + + + + + C4 + + + + + + + C6 + + + + + + develop + + + + + + + master + + + + + + + ruby_client + + + + diff --git a/images/merging-workflows-5.png b/images/merging-workflows-5.png index 151cbd27..4a91da4a 100644 Binary files a/images/merging-workflows-5.png and b/images/merging-workflows-5.png differ diff --git a/images/merging-workflows-5.svg b/images/merging-workflows-5.svg new file mode 100644 index 00000000..d817f71e --- /dev/null +++ b/images/merging-workflows-5.svg @@ -0,0 +1,74 @@ + + + + + + image/svg+xml + + images/merging-workflows-5 + + + + + images/merging-workflows-5 + Created with Sketch. + + + + + C1 + + + + + + C2 + + + + + C5 + + + + + + C3 + + + + + + + C4 + + + + + + + C6 + + + + + + develop + + + + + + + master + + + + + + + ruby_client + + + + diff --git a/images/notifications.png b/images/notifications.png deleted file mode 100644 index 31e05951..00000000 Binary files a/images/notifications.png and /dev/null differ diff --git a/images/perils-of-rebasing-1.png b/images/perils-of-rebasing-1.png index 013e04bf..f9312184 100644 Binary files a/images/perils-of-rebasing-1.png and b/images/perils-of-rebasing-1.png differ diff --git a/images/perils-of-rebasing-1.svg b/images/perils-of-rebasing-1.svg new file mode 100644 index 00000000..ee813308 --- /dev/null +++ b/images/perils-of-rebasing-1.svg @@ -0,0 +1,60 @@ + + + + + + image/svg+xml + + images/perils-of-rebasing-1 + + + + + images/perils-of-rebasing-1 + Created with Sketch. + + + + + + C1 + + + + + + master + + + + + C1 + + + + + C2 + + + + + C3 + + + + + + master + + + + + + + teamone/master + + + My Computer + git.team1.ourcompany.com + + diff --git a/images/perils-of-rebasing-2.png b/images/perils-of-rebasing-2.png index 2c14ccdf..6e6f5585 100644 Binary files a/images/perils-of-rebasing-2.png and b/images/perils-of-rebasing-2.png differ diff --git a/images/perils-of-rebasing-2.svg b/images/perils-of-rebasing-2.svg new file mode 100644 index 00000000..210dd495 --- /dev/null +++ b/images/perils-of-rebasing-2.svg @@ -0,0 +1,106 @@ + + + + + + image/svg+xml + + images/perils-of-rebasing-2 + + + + + images/perils-of-rebasing-2 + Created with Sketch. + + + + + + + C1 + + + + master + + + + C4 + + + + + + C5 + + + + + C6 + + + My Computer + git.team1.ourcompany.com + + + + C1 + + + + + C3 + + + + + + + C7 + + + + + + + C4 + + + + + + + + C5 + + + + + + + C6 + + + + + + + master + + + + + teamone/master + + + + + + + C2 + + + + + diff --git a/images/perils-of-rebasing-3.png b/images/perils-of-rebasing-3.png index 505407a0..1f0603a1 100644 Binary files a/images/perils-of-rebasing-3.png and b/images/perils-of-rebasing-3.png differ diff --git a/images/perils-of-rebasing-3.svg b/images/perils-of-rebasing-3.svg new file mode 100644 index 00000000..1ad6f7da --- /dev/null +++ b/images/perils-of-rebasing-3.svg @@ -0,0 +1,138 @@ + + + + + + image/svg+xml + + images/perils-of-rebasing-3 + + + + + images/perils-of-rebasing-3 + Created with Sketch. + + + + + + + + C1 + + + + + + master + + + + + + C4' + + + + + + C5 + + + + + + + + C4 + + + + + + + + C6 + + + + + + + + C1 + + + + + + C2 + + + + + + + C3 + + + + + + + + C7 + + + + + + + C4' + + + + + + + C4 + + + + + + + C5 + + + + + + + + + C6 + + + + + + + + master + + + + + + + teamone/master + + + + My Computer + git.team1.ourcompany.com + + + diff --git a/images/perils-of-rebasing-4.png b/images/perils-of-rebasing-4.png index 01b9dbba..a1e23f3e 100644 Binary files a/images/perils-of-rebasing-4.png and b/images/perils-of-rebasing-4.png differ diff --git a/images/perils-of-rebasing-4.svg b/images/perils-of-rebasing-4.svg new file mode 100644 index 00000000..f4d24b7f --- /dev/null +++ b/images/perils-of-rebasing-4.svg @@ -0,0 +1,144 @@ + + + + + + image/svg+xml + + images/perils-of-rebasing-4 + + + + + images/perils-of-rebasing-4 + Created with Sketch. + + + + + + + C1 + + + + + master + + + + + + C4' + + + + + + + + C5 + + + + + + + C4 + + + + + + + + C6 + + + + + + + + C1 + + + + + + C2 + + + + + + + C3 + + + + + + + + C7 + + + + + + + + C8 + + + + + + + C4' + + + + + + + C4 + + + + + + + + C5 + + + + + + + C6 + + + + + + + master + + + + + + + + + teamone/master + + + + My Computer + git.team1.ourcompany.com + + diff --git a/images/perils-of-rebasing-5.png b/images/perils-of-rebasing-5.png index 20a18929..27c860d0 100644 Binary files a/images/perils-of-rebasing-5.png and b/images/perils-of-rebasing-5.png differ diff --git a/images/perils-of-rebasing-5.svg b/images/perils-of-rebasing-5.svg new file mode 100644 index 00000000..fcdf683f --- /dev/null +++ b/images/perils-of-rebasing-5.svg @@ -0,0 +1,111 @@ + + + + + + image/svg+xml + + images/perils-of-rebasing-5 + + + + + images/perils-of-rebasing-5 + Created with Sketch. + + + + + + C1 + + + + + + master + + + + + + + C4' + + + + + + + C5 + + + + + + + + C4 + + + + + + + + C6 + + + + + + + + + C1 + + + + + + C4' + + + + + + + + + C2' + + + + + + + C3' + + + + + + + C5 + + + + + + + master + + + + + teamone/master + + + My Computer + git.team1.ourcompany.com + diff --git a/images/posh-git.png b/images/posh-git.png index f66505cf..d403b6dc 100644 Binary files a/images/posh-git.png and b/images/posh-git.png differ diff --git a/images/public-small-1.png b/images/public-small-1.png index efcb90d6..ae0a8665 100644 Binary files a/images/public-small-1.png and b/images/public-small-1.png differ diff --git a/images/public-small-1.svg b/images/public-small-1.svg new file mode 100644 index 00000000..b9384228 --- /dev/null +++ b/images/public-small-1.svg @@ -0,0 +1,82 @@ + + + + + + image/svg+xml + + images/public-small-1 + + + + + images/public-small-1 + Created with Sketch. + + + + 4b078 + + + + + + 1edee + + + + + + + 33009 + + + + + + + 0d708 + + + + + + e5b0f + + + + + a2de3 + + + + + + master + + + + + + + featureA + + + + + + + featureB + + + + + + + + + origin/master + + + + diff --git a/images/public-small-2.png b/images/public-small-2.png index 9dd40631..ba614c1a 100644 Binary files a/images/public-small-2.png and b/images/public-small-2.png differ diff --git a/images/public-small-2.svg b/images/public-small-2.svg new file mode 100644 index 00000000..d1aa124c --- /dev/null +++ b/images/public-small-2.svg @@ -0,0 +1,76 @@ + + + + + + image/svg+xml + + images/public-small-2 + + + + + images/public-small-2 + Created with Sketch. + + + + 4b078 + + + + + 1edee + + + + + 33009 + + + + + + 5399e + + + + + + e5b0f + + + + + dee6b + + + + + master + + + + + + featureA + + + + + + + featureB + + + + + + + + + origin/master + + + + diff --git a/images/public-small-3.png b/images/public-small-3.png index fa06f77e..dfe200de 100644 Binary files a/images/public-small-3.png and b/images/public-small-3.png differ diff --git a/images/public-small-3.svg b/images/public-small-3.svg new file mode 100644 index 00000000..2f31fcc7 --- /dev/null +++ b/images/public-small-3.svg @@ -0,0 +1,108 @@ + + + + + + image/svg+xml + + images/public-small-3 + + + + + + + + + + images/public-small-3 + Created with Sketch. + + + + + + 4b078 + + + + + + 1edee + + + + + + + 33009 + + + + + + + 5399e + + + + + + + 17f4d + + + + + + + e5b0f + + + + + + + dee6b + + + + + + + master + + + + + + + featureA + + + + + + + featureB + + + + + + + featureBv2 + + + + + + + + + origin/master + + + + + diff --git a/images/rebasing-1.png b/images/rebasing-1.png index cd3efa16..98311082 100644 Binary files a/images/rebasing-1.png and b/images/rebasing-1.png differ diff --git a/images/rebasing-1.svg b/images/rebasing-1.svg new file mode 100644 index 00000000..85d75a47 --- /dev/null +++ b/images/rebasing-1.svg @@ -0,0 +1,57 @@ + + + + + + image/svg+xml + + images/rebasing-1 + + + + + images/rebasing-1 + Created with Sketch. + + + + + 0b743 + + + + + + a6b4c + + + + + f42c5 + + + + + + e43a6 + + + + + + 5ddae + + + + + master + + + + + + ruby_client + + + + diff --git a/images/rebasing-2.png b/images/rebasing-2.png index 55ca410b..406f3d08 100644 Binary files a/images/rebasing-2.png and b/images/rebasing-2.png differ diff --git a/images/rebasing-2.svg b/images/rebasing-2.svg new file mode 100644 index 00000000..087b845f --- /dev/null +++ b/images/rebasing-2.svg @@ -0,0 +1,71 @@ + + + + + + image/svg+xml + + images/rebasing-2 + + + + + images/rebasing-2 + Created with Sketch. + + + + + 0b743 + + + + + + a6b4c + + + + + + f42c5 + + + + + + a0a41 + + + + + + master + + + + + + + + + e43a6 + + + + + + + 5ddae + + + + + + + ruby_client + + + + + diff --git a/images/remote-branches-1.png b/images/remote-branches-1.png index 759538f4..40f0cef4 100644 Binary files a/images/remote-branches-1.png and b/images/remote-branches-1.png differ diff --git a/images/remote-branches-1.svg b/images/remote-branches-1.svg new file mode 100644 index 00000000..1e466427 --- /dev/null +++ b/images/remote-branches-1.svg @@ -0,0 +1,78 @@ + + + + + + image/svg+xml + + images/remote-branches-1 + + + + + images/remote-branches-1 + Created with Sketch. + + + + + + 0b743 + + + + + a6b4c + + + + + f4265 + + + + + + master + + + git.ourcompany.com + git clone janedoe@git.ourcompany.com:project.git + + + + 0b743 + + + + + + a6b4c + + + + + + + f4265 + + + + + + + master + + + + + + + origin/master + + + My Computer + Remote branch + Local branch + + diff --git a/images/remote-branches-2.png b/images/remote-branches-2.png index 14cfe56c..6d5117ee 100644 Binary files a/images/remote-branches-2.png and b/images/remote-branches-2.png differ diff --git a/images/remote-branches-2.svg b/images/remote-branches-2.svg new file mode 100644 index 00000000..b76e0fc9 --- /dev/null +++ b/images/remote-branches-2.svg @@ -0,0 +1,95 @@ + + + + + + image/svg+xml + + images/remote-branches-2 + + + + + images/remote-branches-2 + Created with Sketch. + + + + + 0b743 + + + + + a6b4c + + + + + f4265 + + + + + 31b8e + + + + + 190a3 + + + + + + master + + + + + + + 0b743 + + + + + a6b4c + + + + + f4265 + + + + + a38de + + + + + 893cf + + + + + + master + + + + + + + origin/master + + + + + + My Computer + git.ourcompany.com + Someone else pushes + + diff --git a/images/remote-branches-3.png b/images/remote-branches-3.png index 6d1993e4..cfc942d6 100644 Binary files a/images/remote-branches-3.png and b/images/remote-branches-3.png differ diff --git a/images/remote-branches-3.svg b/images/remote-branches-3.svg new file mode 100644 index 00000000..452ae224 --- /dev/null +++ b/images/remote-branches-3.svg @@ -0,0 +1,104 @@ + + + + + + image/svg+xml + + images/remote-branches-3 + + + + + images/remote-branches-3 + Created with Sketch. + + + + 0b743 + + + + + a6b4c + + + + + + f4265 + + + + + + + 31b8e + + + + + 190a3 + + + + a38de + + + + + 893cf + + + + + + master + + + + + + + origin/master + + + + My Computer + + + 0b743 + + + + + a6b4c + + + + + f4265 + + + + + 31b8e + + + + + 190a3 + + + + + + master + + + + git.ourcompany.com + git fetch origin + + + diff --git a/images/remote-branches-4.png b/images/remote-branches-4.png index b4183bf1..a493bffc 100644 Binary files a/images/remote-branches-4.png and b/images/remote-branches-4.png differ diff --git a/images/remote-branches-4.svg b/images/remote-branches-4.svg new file mode 100644 index 00000000..8b7bd0cb --- /dev/null +++ b/images/remote-branches-4.svg @@ -0,0 +1,113 @@ + + + + + + image/svg+xml + + images/remote-branches-4 + + + + + images/remote-branches-4 + Created with Sketch. + + + + 0b743 + + + + + a6b4c + + + + + + f4265 + + + + + + + 31b8e + + + + + 190a3 + + + + a38de + + + + + 893cf + + + + + master + + + + + + origin/master + + + + My Computer + git remote add teamone git://git.team1.ourcompany.com + + + + f4265 + + + + + 31b8e + + + + + 190a3 + + + + + + master + + + + git.ourcompany.com + origin + + + + f4265 + + + + + 31b8e + + + + + + master + + + + git.team1.ourcompany.com + teamone + + diff --git a/images/remote-branches-5.png b/images/remote-branches-5.png index be228239..cad3fe64 100644 Binary files a/images/remote-branches-5.png and b/images/remote-branches-5.png differ diff --git a/images/remote-branches-5.svg b/images/remote-branches-5.svg new file mode 100644 index 00000000..0ba0a047 --- /dev/null +++ b/images/remote-branches-5.svg @@ -0,0 +1,127 @@ + + + + + + image/svg+xml + + images/remote-branches-5 + + + + + images/remote-branches-5 + Created with Sketch. + + + + + + 0b743 + + + + + a6b4c + + + + + + f4265 + + + + + + + 31b8e + + + + + 190a3 + + + + a38de + + + + + 893cf + + + + + + master + + + + + + + origin/master + + + + + + teamone/master + + + + My Computer + git fetch teamone + + + + + f4265 + + + + + 31b8e + + + + + 190a3 + + + + + + master + + + + + git.ourcompany.com + origin + + + + + f4265 + + + + + 31b8e + + + + + + master + + + + + git.team1.ourcompany.com + teamone + + diff --git a/images/replace1.png b/images/replace1.png index f5a23f7f..fb24e911 100644 Binary files a/images/replace1.png and b/images/replace1.png differ diff --git a/images/replace1.svg b/images/replace1.svg new file mode 100644 index 00000000..7475392d --- /dev/null +++ b/images/replace1.svg @@ -0,0 +1,53 @@ + + + + + + image/svg+xml + + images/replace1 + + + + + images/replace1 + Created with Sketch. + + + + + ef989 + fifth + + + + c6e1e + fourth + + + + + 9c68f + third + + + + + 94570 + second + + + + + c1822 + first + + + + + + master + + + + diff --git a/images/replace2.png b/images/replace2.png index 5b03076c..ae3b0a34 100644 Binary files a/images/replace2.png and b/images/replace2.png differ diff --git a/images/replace2.svg b/images/replace2.svg new file mode 100644 index 00000000..30410b0e --- /dev/null +++ b/images/replace2.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + images/replace2 + + + + + images/replace2 + Created with Sketch. + + + + + ef989 + fifth + + + + + + c6e1e + fourth + + + + + + + 9c68f + third + + + + + + 94570 + second + + + + c1822 + first + + + + + + master + + + + + + + history + + + + diff --git a/images/replace3.png b/images/replace3.png index 5c3191cd..da5469fe 100644 Binary files a/images/replace3.png and b/images/replace3.png differ diff --git a/images/replace3.svg b/images/replace3.svg new file mode 100644 index 00000000..193ac798 --- /dev/null +++ b/images/replace3.svg @@ -0,0 +1,73 @@ + + + + + + image/svg+xml + + images/replace3 + + + + + images/replace3 + Created with Sketch. + + + + + 622e8 + instructions + + + + + + c6e1e + fourth + + + + + + + 9c68f + third + + + + + + 94570 + second + + + + c1822 + first + + + + + + history + + + + + + + ef989 + fifth + + + + + + master + + + + + + diff --git a/images/replace4.png b/images/replace4.png index 553820c0..22d456da 100644 Binary files a/images/replace4.png and b/images/replace4.png differ diff --git a/images/replace4.svg b/images/replace4.svg new file mode 100644 index 00000000..9181110f --- /dev/null +++ b/images/replace4.svg @@ -0,0 +1,95 @@ + + + + + + image/svg+xml + + images/replace4 + + + + + images/replace4 + Created with Sketch. + + + + + + + rebase + + + + + + + + ef989 + fifth + + + + + + + master + + + + + + + e146b + fifth + + + + + c6e1e + fourth + + + + + + + history + + + + + + + 81a70 + fourth + + + + + 622e8 + instructions + + + + + + 9c68f + third + + + + + + 94570 + second + + + + c1822 + first + + + + diff --git a/images/replace5.png b/images/replace5.png index 41e7cd7b..f4b49ec9 100644 Binary files a/images/replace5.png and b/images/replace5.png differ diff --git a/images/replace5.svg b/images/replace5.svg new file mode 100644 index 00000000..dae52b66 --- /dev/null +++ b/images/replace5.svg @@ -0,0 +1,89 @@ + + + + + + image/svg+xml + + images/replace5 + + + + + images/replace5 + Created with Sketch. + + + + + + + master + + + + + + + e146b + fifth + + + + + replace + + + + + + + 81a70 + fourth + + + + + 622e8 + instructions + + + + + + + + c6e1e + fourth + + + + + + + history + + + + + + + 9c68f + third + + + + + + 94570 + second + + + + c1822 + first + + + + + diff --git a/images/rerere1.png b/images/rerere1.png index 34ab3b7b..33386cd2 100644 Binary files a/images/rerere1.png and b/images/rerere1.png differ diff --git a/images/rerere1.svg b/images/rerere1.svg new file mode 100644 index 00000000..19b597d8 --- /dev/null +++ b/images/rerere1.svg @@ -0,0 +1,52 @@ + + + + + + image/svg+xml + + images/rerere1 + + + + + images/rerere1 + Created with Sketch. + + + + + + master + + + + + + + hello world + + + + + + + hola world + + + + + + + hello mundo + + + + + + + i18-world + + + + diff --git a/images/rerere2.png b/images/rerere2.png index 85dd47f4..da2f88c5 100644 Binary files a/images/rerere2.png and b/images/rerere2.png differ diff --git a/images/rerere2.svg b/images/rerere2.svg new file mode 100644 index 00000000..041e2685 --- /dev/null +++ b/images/rerere2.svg @@ -0,0 +1,72 @@ + + + + + + image/svg+xml + + images/rerere2 + + + + + images/rerere2 + Created with Sketch. + + + + + + + hello world + + + + + + + hola world + + + + + + + + hola mundo + + + + + hello mundo + + + + + + + + rerere cache + + + + - puts ‘hola world’ - puts ‘hello mundo’ ++ puts ‘hola mundo’ + + + + + + + master + + + + + + + i18-world + + + + + diff --git a/images/rerere3.png b/images/rerere3.png index b299ac74..d20f7a05 100644 Binary files a/images/rerere3.png and b/images/rerere3.png differ diff --git a/images/rerere3.svg b/images/rerere3.svg new file mode 100644 index 00000000..61bd3427 --- /dev/null +++ b/images/rerere3.svg @@ -0,0 +1,123 @@ + + + + + + image/svg+xml + + images/rerere3 + + + + + images/rerere3 + Created with Sketch. + + + + + + + + + + + + + hello world + + + + + + + hola world + + + + + + + master + + + + + + + + rebase + + + + + hello mundo + + + + + + + + + + hola mundo + + + + + + rerere cache + + + + - puts ‘hola world’ - puts ‘hello mundo’ ++ puts ‘hola mundo’ + + + + + + + i18-world + + + + + diff --git a/images/reset-checkout.png b/images/reset-checkout.png index fe036345..72e7c7f0 100644 Binary files a/images/reset-checkout.png and b/images/reset-checkout.png differ diff --git a/images/reset-checkout.svg b/images/reset-checkout.svg new file mode 100644 index 00000000..c7f619e5 --- /dev/null +++ b/images/reset-checkout.svg @@ -0,0 +1,118 @@ + + + + + + image/svg+xml + + images/reset-checkout + + + + + images/reset-checkout + Created with Sketch. + + before command + + + commit A + + + + + commit B + + + + + master + + + + + + + develop + + + + + + + HEAD + + + + + + + commit A + + + + + + commit B + + + + + + + HEAD + + + + + + + master + + + + + + + develop + + + + after reset + + + after checkout + + + + commit A + + + + + commit B + + + + + + master + + + + + + + develop + + + + + + + HEAD + + + + + diff --git a/images/reset-ex1.png b/images/reset-ex1.png index 2ffd68b2..f08aa941 100644 Binary files a/images/reset-ex1.png and b/images/reset-ex1.png differ diff --git a/images/reset-ex1.svg b/images/reset-ex1.svg new file mode 100644 index 00000000..768227f3 --- /dev/null +++ b/images/reset-ex1.svg @@ -0,0 +1,60 @@ + + + + + + image/svg+xml + + images/reset-ex1 + + + + + images/reset-ex1 + Created with Sketch. + + + + + + Index + + + + + + + + HEAD + + + + ? + + Git Repository + + + + + + file.txtv1 + + + + + + WorkingDirectory + + + + + + + HEAD + + + + master + + + diff --git a/images/reset-ex2.png b/images/reset-ex2.png index f4ffd2a7..e6c6aa2b 100644 Binary files a/images/reset-ex2.png and b/images/reset-ex2.png differ diff --git a/images/reset-ex2.svg b/images/reset-ex2.svg new file mode 100644 index 00000000..9ba054f2 --- /dev/null +++ b/images/reset-ex2.svg @@ -0,0 +1,69 @@ + + + + + + image/svg+xml + + images/reset-ex2 + + + + + images/reset-ex2 + Created with Sketch. + + + + + + + HEAD + + + + + git add + + + + + file.txtv1 + + + + + + WorkingDirectory + + + + + + + + Index + + + + + file.txtv1 + + + ? + Git Repository + + + + + + HEAD + + + + master + + + + + diff --git a/images/reset-ex3.png b/images/reset-ex3.png index 74274933..07a6c91a 100644 Binary files a/images/reset-ex3.png and b/images/reset-ex3.png differ diff --git a/images/reset-ex3.svg b/images/reset-ex3.svg new file mode 100644 index 00000000..44c643a9 --- /dev/null +++ b/images/reset-ex3.svg @@ -0,0 +1,87 @@ + + + + + + image/svg+xml + + images/reset-ex3 + + + + + images/reset-ex3 + Created with Sketch. + + + + + + + + HEAD + + + + master + + + + Git Repository + git commit + + + + + file.txtv1 + + + + + + WorkingDirectory + + + + + + + + + HEAD + + + + eb43bf8 + + + file.txtv1 + + + + + + + + Index + + + + + file.txtv1 + + + + + + eb43bf8 + + + file.txtv1 + + + + + + + diff --git a/images/reset-ex4.png b/images/reset-ex4.png index 3cfbf7fc..8c4c01d1 100644 Binary files a/images/reset-ex4.png and b/images/reset-ex4.png differ diff --git a/images/reset-ex4.svg b/images/reset-ex4.svg new file mode 100644 index 00000000..6fa4a42c --- /dev/null +++ b/images/reset-ex4.svg @@ -0,0 +1,75 @@ + + + + + + image/svg+xml + + images/reset-ex4 + + + + + images/reset-ex4 + Created with Sketch. + + + + + + + Index + + + + + + + + HEAD + + + + + Git Repository + + + file.txtv2 + + + + + + + + WorkingDirectory + + + + + file.txtv1 + + edit file + eb43bf8 + eb43bf8 + + + file.txtv1 + + + + file.txtv1 + + + + + + + HEAD + + + + master + + + diff --git a/images/reset-ex5.png b/images/reset-ex5.png index c21a2534..bb03b1ac 100644 Binary files a/images/reset-ex5.png and b/images/reset-ex5.png differ diff --git a/images/reset-ex5.svg b/images/reset-ex5.svg new file mode 100644 index 00000000..fc7067d3 --- /dev/null +++ b/images/reset-ex5.svg @@ -0,0 +1,75 @@ + + + + + + image/svg+xml + + images/reset-ex5 + + + + + images/reset-ex5 + Created with Sketch. + + + + + + + Index + + + + + + + + HEAD + + + + + Git Repository + + + file.txtv2 + + + + + + + + WorkingDirectory + + + git add + eb43bf8 + eb43bf8 + + + file.txtv1 + + + + file.txtv1 + + + + file.txtv2 + + + + + + + HEAD + + + + master + + + diff --git a/images/reset-ex6.png b/images/reset-ex6.png index c64cc38f..55d64c3a 100644 Binary files a/images/reset-ex6.png and b/images/reset-ex6.png differ diff --git a/images/reset-ex6.svg b/images/reset-ex6.svg new file mode 100644 index 00000000..4038dc11 --- /dev/null +++ b/images/reset-ex6.svg @@ -0,0 +1,100 @@ + + + + + + image/svg+xml + + images/reset-ex6 + + + + + images/reset-ex6 + Created with Sketch. + + + Git Repository + git commit + + + + + file.txtv2 + + + + + + + + WorkingDirectory + + + + + + + + + Index + + + + + file.txtv2 + + + + 9e5e6a4 + + + + + + HEAD + + + + + + file.txtv2 + + + + + + + + + eb43bf8 + + + + file.txtv1 + + + + + + 9e5e6a4 + + + + file.txtv2 + + + + + + + + + HEAD + + + + master + + + diff --git a/images/reset-hard.png b/images/reset-hard.png index a9da7ced..c9668bb0 100644 Binary files a/images/reset-hard.png and b/images/reset-hard.png differ diff --git a/images/reset-hard.svg b/images/reset-hard.svg new file mode 100644 index 00000000..f5fe4271 --- /dev/null +++ b/images/reset-hard.svg @@ -0,0 +1,119 @@ + + + + + + image/svg+xml + + images/reset-hard + + + + + images/reset-hard + Created with Sketch. + + + + + + + HEAD + + + + master + + + + git reset --hard HEAD~ + + + 1 + + + + + file.txtv2 + + + + + + + + WorkingDirectory + + + + + + + + + Index + + + + + file.txtv2 + + + + 9e5e6a4 + + + + + + HEAD + + + + + + file.txtv2 + + + + 2 + + + + 3 + + + + + + + + eb43bf8 + + + + file.txtv1 + + + + + + 9e5e6a4 + + + + file.txtv2 + + + + + 38eb946 + + + file.txtv3 + + + Git Repository + + + diff --git a/images/reset-mixed.png b/images/reset-mixed.png index 0266fe51..15db7813 100644 Binary files a/images/reset-mixed.png and b/images/reset-mixed.png differ diff --git a/images/reset-mixed.svg b/images/reset-mixed.svg new file mode 100644 index 00000000..c65c0e19 --- /dev/null +++ b/images/reset-mixed.svg @@ -0,0 +1,113 @@ + + + + + + image/svg+xml + + images/reset-mixed + + + + + images/reset-mixed + Created with Sketch. + + git reset [--mixed] HEAD~ + + + + + HEAD + + + + master + + + + + + 1 + + + + + file.txtv3 + + + + + + + + WorkingDirectory + + + + + + + + + Index + + + + + file.txtv2 + + + + 9e5e6a4 + + + + + + HEAD + + + + + + file.txtv2 + + + + 2 + + + + + + + + eb43bf8 + + + + file.txtv1 + + + + + + 9e5e6a4 + + + + file.txtv2 + + + + + 38eb946 + + + file.txtv3 + + + Git Repository + + diff --git a/images/reset-path1.png b/images/reset-path1.png index 1672e02b..66929fb7 100644 Binary files a/images/reset-path1.png and b/images/reset-path1.png differ diff --git a/images/reset-path1.svg b/images/reset-path1.svg new file mode 100644 index 00000000..f4f774bd --- /dev/null +++ b/images/reset-path1.svg @@ -0,0 +1,76 @@ + + + + + + image/svg+xml + + images/reset-path1 + + + + + images/reset-path1 + Created with Sketch. + + git reset file.txt + + + + + + Index + + + + + + + + HEAD + + + + + Git Repository + + + file.txtv2 + + + + + + + + WorkingDirectory + + + + + file.txtv1 + + eb43bf8 + eb43bf8 + + + file.txtv1 + + + + file.txtv1 + + + + + + HEAD + + + + master + + + + + diff --git a/images/reset-path2.png b/images/reset-path2.png index 08308e5e..d4106fd5 100644 Binary files a/images/reset-path2.png and b/images/reset-path2.png differ diff --git a/images/reset-path2.svg b/images/reset-path2.svg new file mode 100644 index 00000000..575e0d65 --- /dev/null +++ b/images/reset-path2.svg @@ -0,0 +1,76 @@ + + + + + + image/svg+xml + + images/reset-path2 + + + + + images/reset-path2 + Created with Sketch. + + git add file.txt + + + + + + Index + + + + + + + + HEAD + + + + + Git Repository + + + file.txtv2 + + + + + + + + WorkingDirectory + + + + + file.txtv2 + + eb43bf8 + eb43bf8 + + + file.txtv1 + + + + file.txtv1 + + + + + + HEAD + + + + master + + + + + diff --git a/images/reset-path3.png b/images/reset-path3.png index e01f80ae..71e60b8c 100644 Binary files a/images/reset-path3.png and b/images/reset-path3.png differ diff --git a/images/reset-path3.svg b/images/reset-path3.svg new file mode 100644 index 00000000..9565e24f --- /dev/null +++ b/images/reset-path3.svg @@ -0,0 +1,107 @@ + + + + + + image/svg+xml + + images/reset-path3 + + + + + images/reset-path3 + Created with Sketch. + + + git reset eb43 -- file.txt + + + + + HEAD + + + + master + + + + + + + + eb43bf8 + + + + file.txtv1 + + + + + + 9e5e6a4 + + + + file.txtv2 + + + + + 38eb946 + + + file.txtv3 + + + Git Repository + + + + + file.txtv3 + + + + + + + + WorkingDirectory + + + + + + + + + Index + + + + + file.txtv1 + + + + 38eb946 + + + + + + HEAD + + + + + + file.txtv3 + + + + + diff --git a/images/reset-soft.png b/images/reset-soft.png index 831d9f6f..b5098595 100644 Binary files a/images/reset-soft.png and b/images/reset-soft.png differ diff --git a/images/reset-soft.svg b/images/reset-soft.svg new file mode 100644 index 00000000..09fe219d --- /dev/null +++ b/images/reset-soft.svg @@ -0,0 +1,106 @@ + + + + + + image/svg+xml + + images/reset-soft + + + + + images/reset-soft + Created with Sketch. + + git reset --soft HEAD~ + + + + + + + + eb43bf8 + + + + file.txtv1 + + + + + 9e5e6a4 + + + + file.txtv2 + + + + 38eb946 + + + file.txtv3 + + + + Git Repository + + + + + + HEAD + + + + master + + + + + + + file.txtv3 + + + + + + + + WorkingDirectory + + + + + 9e5e6a4 + + + file.txtv2 + + + + + + + HEAD + + + + + + + + + + Index + + + + + file.txtv3 + + + diff --git a/images/reset-squash-r1.png b/images/reset-squash-r1.png index e703a309..b328fc23 100644 Binary files a/images/reset-squash-r1.png and b/images/reset-squash-r1.png differ diff --git a/images/reset-squash-r1.svg b/images/reset-squash-r1.svg new file mode 100644 index 00000000..7aa6bf2e --- /dev/null +++ b/images/reset-squash-r1.svg @@ -0,0 +1,132 @@ + + + + + + image/svg+xml + + images/reset-squash-r1 + + + + + images/reset-squash-r1 + Created with Sketch. + + Git Repository + + + + + + + HEAD + + + + master + + + + + + + + file-a.txt v1 + + eb43bf8 + + + + 9e5e6a4 + + + file-a.txt v2 + + + + file-b.txt v1 + + + + + 38eb946 + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + + + + + + + + + WorkingDirectory + + + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + + + + + Index + + + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + 38eb946 + + + + + + + HEAD + + + + + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + diff --git a/images/reset-squash-r2.png b/images/reset-squash-r2.png index 8b3bd443..61a24472 100644 Binary files a/images/reset-squash-r2.png and b/images/reset-squash-r2.png differ diff --git a/images/reset-squash-r2.svg b/images/reset-squash-r2.svg new file mode 100644 index 00000000..47859265 --- /dev/null +++ b/images/reset-squash-r2.svg @@ -0,0 +1,139 @@ + + + + + + image/svg+xml + + images/reset-squash-r2 + + + + + images/reset-squash-r2 + Created with Sketch. + + 38eb946 + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + git reset --soft HEAD~2 + + + Git Repository + + + + + file-a.txt v1 + + eb43bf8 + + + + + + 9e5e6a4 + + + file-a.txt v2 + + + + file-b.txt v1 + + + + + + + HEAD + + + + master + + + + + 38eb946 + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + + + + + + + + WorkingDirectory + + + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + + + + + Index + + + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + + + + + + HEAD + + + + + + file-a.txt v1 + + eb43bf8 + + + + diff --git a/images/reset-squash-r3.png b/images/reset-squash-r3.png index 87e44cbe..510e027a 100644 Binary files a/images/reset-squash-r3.png and b/images/reset-squash-r3.png differ diff --git a/images/reset-squash-r3.svg b/images/reset-squash-r3.svg new file mode 100644 index 00000000..144f0955 --- /dev/null +++ b/images/reset-squash-r3.svg @@ -0,0 +1,147 @@ + + + + + + image/svg+xml + + images/reset-squash-r3 + + + + + images/reset-squash-r3 + Created with Sketch. + + + git commit + + + + + + + Git Repository + + + + + file-a.txt v1 + + eb43bf8 + + + + 9e5e6a4 + + + file-a.txt v2 + + + + file-b.txt v1 + + + + + + + HEAD + + + + master + + + + + + + + + + WorkingDirectory + + + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + + + + + Index + + + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + 68aef35 + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + + + + HEAD + + + + + + + 68aef35 + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + + 38eb946 + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + diff --git a/images/reset-start.png b/images/reset-start.png index 70b3fb06..2d7b1523 100644 Binary files a/images/reset-start.png and b/images/reset-start.png differ diff --git a/images/reset-start.svg b/images/reset-start.svg new file mode 100644 index 00000000..38048142 --- /dev/null +++ b/images/reset-start.svg @@ -0,0 +1,100 @@ + + + + + + image/svg+xml + + images/reset-start + + + + + images/reset-start + Created with Sketch. + + + + + + + eb43bf8 + + + file.txtv1 + + + + + 9e5e6a4 + + + file.txtv2 + + + + + 38eb946 + + + file.txtv3 + + + Git Repository + + + + + HEAD + + + + master + + + + + + file.txtv3 + + + + + + + + WorkingDirectory + + + + + + + + + Index + + + + + file.txtv3 + + + + 38eb946 + + + + + + HEAD + + + + + + file.txtv3 + + + + diff --git a/images/reset-workflow.png b/images/reset-workflow.png index 1c01e0d5..c741d4bd 100644 Binary files a/images/reset-workflow.png and b/images/reset-workflow.png differ diff --git a/images/reset-workflow.svg b/images/reset-workflow.svg new file mode 100644 index 00000000..35be798c --- /dev/null +++ b/images/reset-workflow.svg @@ -0,0 +1,48 @@ + + + + + + image/svg+xml + + images/reset-workflow + + + + + images/reset-workflow + Created with Sketch. + + + + + + + + + + Index + + + + HEAD + + + + WorkingDirectory + + + + Checkout the project + + + + Commit + + + + Stage Files + + + + diff --git a/images/small-team-1.png b/images/small-team-1.png index d13654ec..3dd5be18 100644 Binary files a/images/small-team-1.png and b/images/small-team-1.png differ diff --git a/images/small-team-1.svg b/images/small-team-1.svg new file mode 100644 index 00000000..e33ae1b1 --- /dev/null +++ b/images/small-team-1.svg @@ -0,0 +1,56 @@ + + + + + + image/svg+xml + + images/small-team-1 + + + + + images/small-team-1 + Created with Sketch. + + + + 4b078 + + + + + + 1edee + + + + + + + 738ee + + + + + + + fbff5 + + + + + + + origin/master + + + + + + + master + + + + diff --git a/images/small-team-2.png b/images/small-team-2.png index 1af62787..f738c75b 100644 Binary files a/images/small-team-2.png and b/images/small-team-2.png differ diff --git a/images/small-team-2.svg b/images/small-team-2.svg new file mode 100644 index 00000000..78e7d23a --- /dev/null +++ b/images/small-team-2.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + images/small-team-2 + + + + + images/small-team-2 + Created with Sketch. + + + + 4b078 + + + + + + 1edee + + + + + + + 738ee + + + + + + + + 72bbc + + + + + + + fbff5 + + + + + + + origin/master + + + + + + + master + + + + diff --git a/images/small-team-3.png b/images/small-team-3.png index 3b01de8b..31d0f726 100644 Binary files a/images/small-team-3.png and b/images/small-team-3.png differ diff --git a/images/small-team-3.svg b/images/small-team-3.svg new file mode 100644 index 00000000..1a2dbd42 --- /dev/null +++ b/images/small-team-3.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + images/small-team-3 + + + + + images/small-team-3 + Created with Sketch. + + + + 4b078 + + + + + + 1edee + + + + + + + 738ee + + + + + + + + 72bbc + + + + + + + fbff5 + + + + + + + origin/master + + + + + + + master + + + + diff --git a/images/small-team-4.png b/images/small-team-4.png index b5e8c00b..a649b97e 100644 Binary files a/images/small-team-4.png and b/images/small-team-4.png differ diff --git a/images/small-team-4.svg b/images/small-team-4.svg new file mode 100644 index 00000000..3cd495ed --- /dev/null +++ b/images/small-team-4.svg @@ -0,0 +1,75 @@ + + + + + + image/svg+xml + + images/small-team-4 + + + + + images/small-team-4 + Created with Sketch. + + + + 4b078 + + + + + + 1edee + + + + + + + fbff5 + + + + + + + 8149a + + + + + + + 23ac6 + + + + + + + 4af42 + + + + + + + origin/master + + + + + + master + + + + + + issue54 + + + + diff --git a/images/small-team-5.png b/images/small-team-5.png index e0215e4f..8219ac30 100644 Binary files a/images/small-team-5.png and b/images/small-team-5.png differ diff --git a/images/small-team-5.svg b/images/small-team-5.svg new file mode 100644 index 00000000..8279e682 --- /dev/null +++ b/images/small-team-5.svg @@ -0,0 +1,90 @@ + + + + + + image/svg+xml + + images/small-team-5 + + + + + images/small-team-5 + Created with Sketch. + + + + 4b078 + + + + + + 1edee + + + + + + fbff5 + + + + + + 738ee + + + + + + + + 72bbc + + + + + + + 8149a + + + + + + + 23ac6 + + + + + + + 4af42 + + + + + + + origin/master + + + + + + + master + + + + + + + issue54 + + + + diff --git a/images/small-team-6.png b/images/small-team-6.png index 35794441..23bc4e1e 100644 Binary files a/images/small-team-6.png and b/images/small-team-6.png differ diff --git a/images/small-team-6.svg b/images/small-team-6.svg new file mode 100644 index 00000000..0c0804b7 --- /dev/null +++ b/images/small-team-6.svg @@ -0,0 +1,100 @@ + + + + + + image/svg+xml + + images/small-team-6 + + + + + images/small-team-6 + Created with Sketch. + + + + 4b078 + + + + + + 1edee + + + + + + + fbff5 + + + + + + + 738ee + + + + + + + + 72bbc + + + + + + + + 8059c + + + + + + + 8149a + + + + + + + 23ac6 + + + + + + + 4af42 + + + + + + + origin/master + + + + + + + master + + + + + + + issue54 + + + + diff --git a/images/small-team-7.png b/images/small-team-7.png index 6bbbc2d8..64ae230a 100644 Binary files a/images/small-team-7.png and b/images/small-team-7.png differ diff --git a/images/small-team-7.svg b/images/small-team-7.svg new file mode 100644 index 00000000..72607627 --- /dev/null +++ b/images/small-team-7.svg @@ -0,0 +1,100 @@ + + + + + + image/svg+xml + + images/small-team-7 + + + + + images/small-team-7 + Created with Sketch. + + + + 4b078 + + + + + + 1edee + + + + + + + fbff5 + + + + + + + 738ee + + + + + + + + 72bbc + + + + + + + + 8059c + + + + + + + 8149a + + + + + + + 23ac6 + + + + + + + 4af42 + + + + + + + origin/master + + + + + + + master + + + + + + + issue54 + + + + diff --git a/images/small-team-flow.png b/images/small-team-flow.png index c8589ba6..12fe526f 100644 Binary files a/images/small-team-flow.png and b/images/small-team-flow.png differ diff --git a/images/small-team-flow.svg b/images/small-team-flow.svg new file mode 100644 index 00000000..93a805c1 --- /dev/null +++ b/images/small-team-flow.svg @@ -0,0 +1,400 @@ + + + + + + + + image/svg+xml + + images/small-team-flow + + + + + images/small-team-flow + Created with Sketch. + + + + + + Server + + + + + + John + + + + + + Jessica + + + + + + + git clone + + + git commit + + + git clone + + + + git fetch + + + + git push + + + + git push + + + + git push + + + + git fetch + + + + git fetch + + + + + git commit + + + + git merge + + + + git merge + + + + + + Server + + + + + + John + + + + + + Jessica + + + + diff --git a/images/smudge.png b/images/smudge.png index d86aa05c..7d4d84be 100644 Binary files a/images/smudge.png and b/images/smudge.png differ diff --git a/images/smudge.svg b/images/smudge.svg new file mode 100644 index 00000000..26b7f823 --- /dev/null +++ b/images/smudge.svg @@ -0,0 +1,60 @@ + + + + + + image/svg+xml + + images/smudge + + + + + images/smudge + Created with Sketch. + + + + + fileA.txt + + + + + fileA.txt' + + + + fileB.txt' + + + + fileB.txt + + + + fileC.rb + + + + fileC.rb + + Staging Area + Working Directory + *.txt Filter + + + smudge + + + + clean + + + + + + + + + diff --git a/images/snapshots.png b/images/snapshots.png index 1036a424..0c9e0e28 100644 Binary files a/images/snapshots.png and b/images/snapshots.png differ diff --git a/images/snapshots.svg b/images/snapshots.svg new file mode 100644 index 00000000..f4af9c32 --- /dev/null +++ b/images/snapshots.svg @@ -0,0 +1,108 @@ + + + + + + image/svg+xml + + images/snapshots + + + + + images/snapshots + Created with Sketch. + + + + + + + + + Version 1 + + + + Version 2 + + + + Version 3 + + + + Version 4 + + + + Version 5 + + + + File A + + + + File A + + + + + A1 + + + + + C1 + + + + C2 + + + + B1 + + + + A2 + + + + A2 + + + + B2 + + + C3 + + + File B + + + + File C + + + Checkins Over Time + + + B + + + + A1 + + + + C2 + + + + B + + + diff --git a/images/symbols.svg b/images/symbols.svg new file mode 100644 index 00000000..164a1ebb --- /dev/null +++ b/images/symbols.svg @@ -0,0 +1,158 @@ + + + + images/symbols + Created with Sketch. + + + + + C6 + + + + + + v1.0 + + + + + + HEAD + + + + + + tree + + + + + + Version 5 + + + + + + integration + manager + + + + + + developer + public + + + + + + Staging + Area + + + + + + 9c68f + + + + + + c2b9e + + + + + + HEAD + + + + + + Working + Directory + + + + + + size + 92ec2 + Scott + Scott + + + commit + + tree + author + committer + + + The initial commit of my project + + + + + + size + 5b1d3 README + 911e7 LICENSE + cba0a test.rb + + + tree + + blob + blob + blob + + + + + + size + + + blob + + + == Testing library + + This library is used to test + Ruby projects. + + + + + + hello mundo + + + + + + fbff5 + + + + + + 738ee + + + + + + fba9a + + + + diff --git a/images/topic-branches-1.png b/images/topic-branches-1.png index 3bdca0dc..d7bb02b6 100644 Binary files a/images/topic-branches-1.png and b/images/topic-branches-1.png differ diff --git a/images/topic-branches-1.svg b/images/topic-branches-1.svg new file mode 100644 index 00000000..f181fbfa --- /dev/null +++ b/images/topic-branches-1.svg @@ -0,0 +1,102 @@ + + + + + + image/svg+xml + + images/topic-branches-1 + + + + + images/topic-branches-1 + Created with Sketch. + + + + C0 + + + + + C1 + + + + + C3 + + + + + C9 + + + + + C10 + + + + + C2 + + + + + C4 + + + + + C5 + + + + + C6 + + + + + C12 + + + + + C13 + + + + + C7 + + + + + C8 + + + + + C11 + + + + master + + + + iss91 + + + + iss91v2 + + + + dumbidea + + + diff --git a/images/topic-branches-2.png b/images/topic-branches-2.png index fe139d99..1d789a2f 100644 Binary files a/images/topic-branches-2.png and b/images/topic-branches-2.png differ diff --git a/images/topic-branches-2.svg b/images/topic-branches-2.svg new file mode 100644 index 00000000..a17db5e4 --- /dev/null +++ b/images/topic-branches-2.svg @@ -0,0 +1,118 @@ + + + + + + image/svg+xml + + images/topic-branches-2 + + + + + images/topic-branches-2 + Created with Sketch. + + + + C0 + + + + + + C1 + + + + + + + C3 + + + + + + + C9 + + + + + + + C10 + + + + + + + C2 + + + + + + + C4 + + + + + + + C13 + + + + + + + + C14 + + + + + + + C12 + + + + + master + + + + + + C7 + + + + + + + C8 + + + + + + + C11 + + + + + iss91v2 + + + + dumbidea + + + diff --git a/images/two-branches.png b/images/two-branches.png index aa6377a0..9cdbdccc 100644 Binary files a/images/two-branches.png and b/images/two-branches.png differ diff --git a/images/two-branches.svg b/images/two-branches.svg new file mode 100644 index 00000000..ded4572c --- /dev/null +++ b/images/two-branches.svg @@ -0,0 +1,51 @@ + + + + + + image/svg+xml + + images/two-branches + + + + + images/two-branches + Created with Sketch. + + + + + + master + + + + + + + testing + + + + + + + f30ab + + + + + + + + + 34ac2 + + + + + 98ca9 + + + diff --git a/images/undomerge-reset.png b/images/undomerge-reset.png index 3ffcc624..a0a3503c 100644 Binary files a/images/undomerge-reset.png and b/images/undomerge-reset.png differ diff --git a/images/undomerge-reset.svg b/images/undomerge-reset.svg new file mode 100644 index 00000000..e9a0f8ab --- /dev/null +++ b/images/undomerge-reset.svg @@ -0,0 +1,83 @@ + + + + + + image/svg+xml + + images/undomerge-reset + + + + + images/undomerge-reset + Created with Sketch. + + + + C1 + + + + + + + C2 + + + + + + + C5 + + + + + C3 + + + + + C4 + + + + + + C6 + + + + + + + + M + + + + + + + + master + + + + + + + HEAD + + + + + + + + topic + + + + diff --git a/images/undomerge-revert.png b/images/undomerge-revert.png index 87cd7c93..d84d717f 100644 Binary files a/images/undomerge-revert.png and b/images/undomerge-revert.png differ diff --git a/images/undomerge-revert.svg b/images/undomerge-revert.svg new file mode 100644 index 00000000..df81ae26 --- /dev/null +++ b/images/undomerge-revert.svg @@ -0,0 +1,88 @@ + + + + + + image/svg+xml + + images/undomerge-revert + + + + + images/undomerge-revert + Created with Sketch. + + + + C1 + + + + + + + + C2 + + + + + + + C5 + + + + + C3 + + + + + C4 + + + + + + C6 + + + + + + + M + + + + + + ^M + + + + + + + master + + + + + + + HEAD + + + + + + + + topic + + + + diff --git a/images/undomerge-revert2.png b/images/undomerge-revert2.png index dc5727ea..e93127f9 100644 Binary files a/images/undomerge-revert2.png and b/images/undomerge-revert2.png differ diff --git a/images/undomerge-revert2.svg b/images/undomerge-revert2.svg new file mode 100644 index 00000000..146d80eb --- /dev/null +++ b/images/undomerge-revert2.svg @@ -0,0 +1,99 @@ + + + + + + image/svg+xml + + images/undomerge-revert2 + + + + + images/undomerge-revert2 + Created with Sketch. + + + + C1 + + + + + + + + C2 + + + + + + + C5 + + + + + C3 + + + + + C4 + + + + + + C6 + + + + + + C7 + + + + + + C8 + + + + + + M + + + + + + ^M + + + + + + + master + + + + + + + HEAD + + + + + + + + topic + + + + diff --git a/images/undomerge-revert3.png b/images/undomerge-revert3.png index 71f94a63..31206d15 100644 Binary files a/images/undomerge-revert3.png and b/images/undomerge-revert3.png differ diff --git a/images/undomerge-revert3.svg b/images/undomerge-revert3.svg new file mode 100644 index 00000000..7459de45 --- /dev/null +++ b/images/undomerge-revert3.svg @@ -0,0 +1,106 @@ + + + + + + image/svg+xml + + images/undomerge-revert3 + + + + + images/undomerge-revert3 + Created with Sketch. + + + + C1 + + + + + + + + C2 + + + + + + + C5 + + + + + C3 + + + + + C4 + + + + + + C6 + + + + + + C7 + + + + + + ^^M + + + + + + + C8 + + + + + + M + + + + + + ^M + + + + + + + master + + + + + + + HEAD + + + + + + + + topic + + + + diff --git a/images/undomerge-start.png b/images/undomerge-start.png index 518a71d8..8d286fab 100644 Binary files a/images/undomerge-start.png and b/images/undomerge-start.png differ diff --git a/images/undomerge-start.svg b/images/undomerge-start.svg new file mode 100644 index 00000000..8a9e3bb0 --- /dev/null +++ b/images/undomerge-start.svg @@ -0,0 +1,79 @@ + + + + + + image/svg+xml + + images/undomerge-start + + + + + images/undomerge-start + Created with Sketch. + + + + C1 + + + + + + + + C2 + + + + + + + C5 + + + + + C3 + + + + + C4 + + + + + + C6 + + + + + + M + + + + + + master + + + + + + + HEAD + + + + + + + topic + + + + diff --git a/images/vs-1.png b/images/vs-1.png deleted file mode 100644 index 312cde3b..00000000 Binary files a/images/vs-1.png and /dev/null differ diff --git a/images/vs-2.png b/images/vs-2.png deleted file mode 100644 index 78d404c2..00000000 Binary files a/images/vs-2.png and /dev/null differ