From 2168be16351f945fa0695ccdfdd3496455e4cc0f Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 7 Jan 2014 11:35:24 -0800 Subject: [PATCH 1/9] GitHub is a chapter --- OUTLINE.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/OUTLINE.txt b/OUTLINE.txt index f0310a17b..dadadd570 100644 --- a/OUTLINE.txt +++ b/OUTLINE.txt @@ -111,14 +111,6 @@ * Other Features 4.9 Git Daemon 4.10 Hosted Git - * GitHub - * Setting Up a User Account - * Creating a New Repository - * Importing from Subversion - * Adding Collaborators - * Your Project - * Forking Projects - * GitHub Summary 4.11 Summary 5. Distributed Git @@ -259,3 +251,12 @@ * Data Recovery * Removing Objects 9.8 Summary + +10. GitHub +10.1 Setting Up a User Account +10.2 Creating a New Repository +10.3 Importing from Subversion +10.4 Adding Collaborators +10.5 Your Project +10.6 Forking Projects +10.7 GitHub Summary From c3cf5ff842dbc982ec3a93b2609748fbe66b2fdf Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 7 Jan 2014 15:48:31 -0800 Subject: [PATCH 2/9] Tweak github chapter --- OUTLINE.txt | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/OUTLINE.txt b/OUTLINE.txt index dadadd570..885ed93ac 100644 --- a/OUTLINE.txt +++ b/OUTLINE.txt @@ -254,9 +254,31 @@ 10. GitHub 10.1 Setting Up a User Account -10.2 Creating a New Repository -10.3 Importing from Subversion -10.4 Adding Collaborators -10.5 Your Project -10.6 Forking Projects -10.7 GitHub Summary +10.2 Projects + * Creating a repository + * Adding collaborators + * Your Project + * Forking +10.3 GitHub Flow +10.4 Discussions + * PR/issue/discussion + * Markdown + * Notifications + * Email + * Mentions (issue/person/team) +10.5 Organizations + * Teams +10.6 Enterprise +10.7 Tips & Tricks + * Importing + * Subversion Interop + * hub or gh + * pull-request refs + * keyboard shortcuts + * ignore whitespace + * rev-parse specs + * commits by author + * .diff and .patch + * Line linking +10.8 The API +10.9 Summary From c63aab8d4e78806b90c927dd669acb3fe2896e03 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Wed, 8 Jan 2014 15:21:02 -0800 Subject: [PATCH 3/9] Three trees --- OUTLINE.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/OUTLINE.txt b/OUTLINE.txt index 885ed93ac..a9182cb4a 100644 --- a/OUTLINE.txt +++ b/OUTLINE.txt @@ -143,6 +143,14 @@ 5.4 Summary 6. Git Tools +6.X Reset Demystified + * The Three Trees + * The Workflow + * The Role of Reset + * Reset With a Path + * A Fun Example + * Check It Out + * Summary 6.1 Revision Selection * Single Revisions * Short SHA From b04172886e837a5a66039f47655a44da29fa6dc2 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Wed, 8 Jan 2014 15:37:54 -0800 Subject: [PATCH 4/9] Add some things --- OUTLINE.txt | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/OUTLINE.txt b/OUTLINE.txt index a9182cb4a..81a86f272 100644 --- a/OUTLINE.txt +++ b/OUTLINE.txt @@ -20,6 +20,7 @@ * Your Editor * Your Diff Tool * Checking Your Settings + * Credential Caching 1.6 Getting Help 1.7 Summary @@ -44,6 +45,7 @@ * Changing Your Last Commit * Unstaging a Staged File * Unmodifying a Modified File + * Undoing All Changes 2.5 Working with Remotes * Showing Your Remotes * Adding Remote Repositories @@ -71,6 +73,8 @@ * Basic Branching * Basic Merging * Basic Merge Conflicts + * Rerere + * Undoing Merges (or should this go in "Undoing Things"?) 3.3 Branch Management 3.4 Branching Workflows * Long-Running Branches @@ -83,6 +87,7 @@ * The Basic Rebase * More Interesting Rebases * The Perils of Rebasing + * Rebase vs. Merge 3.7 Summary 4. Git on the Server @@ -188,6 +193,15 @@ * Superprojects * Issues with Submodules 6.7 Subtree Merging +6.X Notes +6.X Bundle +6.X Searching + * git grep +6.X Graphical Tools + * gitk/git gui + * GitHub for Windows/Mac + * Others? + * IDE Integration (VS, Eclipse) 6.8 Summary 7. Customizing Git @@ -251,13 +265,19 @@ * Deleting References 9.6 Transfer Protocols * The Dumb Protocol - * The Smart Protocol + * The Smart Protocol (include HTTP/S) * Uploading Data * Downloading Data + * Credential Caching 9.7 Maintenance and Data Recovery * Maintenance * Data Recovery * Removing Objects +9.X History Hacks + * Grafts (maybe? this is deprecated) + * Replace + * Shallow +9.X Environment Variables 9.8 Summary 10. GitHub From 76a43122b62257910206b4cc89e5f7d5ef4ccae5 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Thu, 9 Jan 2014 08:46:48 -0800 Subject: [PATCH 5/9] Feedback --- OUTLINE.txt | 113 +++++++++++++++++++++++++++------------------------- 1 file changed, 59 insertions(+), 54 deletions(-) diff --git a/OUTLINE.txt b/OUTLINE.txt index 81a86f272..fb5376635 100644 --- a/OUTLINE.txt +++ b/OUTLINE.txt @@ -42,10 +42,18 @@ * Limiting Log Output * Using a GUI to Visualize History 2.4 Undoing Things + * Reset Demystified + * The Three Trees + * The Workflow + * The Role of Reset + * Reset With a Path + * A Fun Example + * Check It Out + * Summary * Changing Your Last Commit * Unstaging a Staged File * Unmodifying a Modified File - * Undoing All Changes + * Undoing All Changes (clean) 2.5 Working with Remotes * Showing Your Remotes * Adding Remote Repositories @@ -73,8 +81,7 @@ * Basic Branching * Basic Merging * Basic Merge Conflicts - * Rerere - * Undoing Merges (or should this go in "Undoing Things"?) + * Undoing Merges 3.3 Branch Management 3.4 Branching Workflows * Long-Running Branches @@ -147,15 +154,38 @@ * The Shortlog 5.4 Summary +X. GitHub +X.X Setting Up a User Account +X.X Projects + * Creating a repository + * Adding collaborators + * Your Project + * Forking +X.X GitHub Flow +X.X Discussions + * PR/issue/discussion + * Markdown + * Notifications + * Email + * Mentions (issue/person/team) +X.X Organizations + * Teams +X.X Tips & Tricks + * Importing + * Subversion Interop + * hub or gh + * pull-request refs + * keyboard shortcuts + * ignore whitespace + * rev-parse specs + * commits by author + * .diff and .patch + * Line linking + * Search/Command Bar +X.X The API +X.X Summary + 6. Git Tools -6.X Reset Demystified - * The Three Trees - * The Workflow - * The Role of Reset - * Reset With a Path - * A Fun Example - * Check It Out - * Summary 6.1 Revision Selection * Single Revisions * Short SHA @@ -174,6 +204,7 @@ * Stashing Your Work * Un-applying a Stash * Creating a Branch from a Stash +6.X Searching (git grep) 6.4 Rewriting History * Changing the Last Commit * Changing Multiple Commit Messages @@ -195,13 +226,11 @@ 6.7 Subtree Merging 6.X Notes 6.X Bundle -6.X Searching - * git grep -6.X Graphical Tools - * gitk/git gui - * GitHub for Windows/Mac - * Others? - * IDE Integration (VS, Eclipse) +6.X Rerere +9.X History Hacks + * Grafts (maybe? this is deprecated) + * Replace + * Shallow 6.8 Summary 7. Customizing Git @@ -247,8 +276,20 @@ * Subversion * Perforce * A Custom Importer +8.X A Custom Credential Cache 8.3 Summary +X. Git in Other Environments +X.X Graphical Interfaces + * gitk & git gui + * GitHub for Windows/Mac + * (Others) +X.X Git in Visual Studio +X.X Git in Eclipse +X.X Git in Bash +X.X Git in Zsh +X.X Git in Powershell + 9. Git Internals 9.1 Plumbing and Porcelain 9.2 Git Objects @@ -268,45 +309,9 @@ * The Smart Protocol (include HTTP/S) * Uploading Data * Downloading Data - * Credential Caching 9.7 Maintenance and Data Recovery * Maintenance * Data Recovery * Removing Objects -9.X History Hacks - * Grafts (maybe? this is deprecated) - * Replace - * Shallow 9.X Environment Variables 9.8 Summary - -10. GitHub -10.1 Setting Up a User Account -10.2 Projects - * Creating a repository - * Adding collaborators - * Your Project - * Forking -10.3 GitHub Flow -10.4 Discussions - * PR/issue/discussion - * Markdown - * Notifications - * Email - * Mentions (issue/person/team) -10.5 Organizations - * Teams -10.6 Enterprise -10.7 Tips & Tricks - * Importing - * Subversion Interop - * hub or gh - * pull-request refs - * keyboard shortcuts - * ignore whitespace - * rev-parse specs - * commits by author - * .diff and .patch - * Line linking -10.8 The API -10.9 Summary From 3a07fc7e40eb8fafb9098b7a2a0ff261b3e06dff Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Thu, 9 Jan 2014 08:58:43 -0800 Subject: [PATCH 6/9] More hosting, hg, and libgit2 --- OUTLINE.txt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/OUTLINE.txt b/OUTLINE.txt index fb5376635..b95a77707 100644 --- a/OUTLINE.txt +++ b/OUTLINE.txt @@ -111,7 +111,7 @@ 4.4 Setting Up the Server 4.5 Public Access 4.6 GitWeb -4.7 Gitosis +4.9 Git Daemon 4.8 Gitolite * Installing * Customising the Install @@ -121,8 +121,8 @@ * Personal Branches * "Wildcard" repositories * Other Features -4.9 Git Daemon -4.10 Hosted Git +4.X GitLab +4.10 Other Hosting Options (bitbucket, stash, kiln, etc.) 4.11 Summary 5. Distributed Git @@ -271,6 +271,7 @@ X.X Summary * SVN Server Information * Ignoring What Subversion Ignores * Git-Svn Summary +8.X Git and Mercurial 8.2 Migrating to Git * Importing * Subversion @@ -289,6 +290,13 @@ X.X Git in Eclipse X.X Git in Bash X.X Git in Zsh X.X Git in Powershell +X.X Git in Your Application + * libgit2 + * libgit2sharp + * Objective-Git + * Rugged + * Pygit2 + * (others) 9. Git Internals 9.1 Plumbing and Porcelain From 11f2ca2bbb2ca6b371517e06dcbf95fd798d5117 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Sun, 12 Jan 2014 16:20:56 -0800 Subject: [PATCH 7/9] Other-system completionism/symmetry --- OUTLINE.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OUTLINE.txt b/OUTLINE.txt index b95a77707..a13a4bfe7 100644 --- a/OUTLINE.txt +++ b/OUTLINE.txt @@ -272,10 +272,14 @@ X.X Summary * Ignoring What Subversion Ignores * Git-Svn Summary 8.X Git and Mercurial +8.X Git and Perforce +8.X Git and TFS 8.2 Migrating to Git * Importing * Subversion + * Mercurial * Perforce + * TFS * A Custom Importer 8.X A Custom Credential Cache 8.3 Summary From 750ced0fcb3e3bba36f17ccaac4aca03a13f8558 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Sun, 12 Jan 2014 16:21:06 -0800 Subject: [PATCH 8/9] Gerrit --- OUTLINE.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/OUTLINE.txt b/OUTLINE.txt index a13a4bfe7..75b8dacf6 100644 --- a/OUTLINE.txt +++ b/OUTLINE.txt @@ -122,6 +122,7 @@ * "Wildcard" repositories * Other Features 4.X GitLab +4.X Gerrit 4.10 Other Hosting Options (bitbucket, stash, kiln, etc.) 4.11 Summary From 9db34fe030c0c9c57947f77a0a464fa06448e7ca Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Sun, 12 Jan 2014 16:21:14 -0800 Subject: [PATCH 9/9] request-pull --- OUTLINE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OUTLINE.txt b/OUTLINE.txt index 75b8dacf6..b9046ab0e 100644 --- a/OUTLINE.txt +++ b/OUTLINE.txt @@ -136,7 +136,7 @@ * Private Small Team * Private Managed Team * Public Small Project - * Public Large Project + * Public Large Project (request-pull) * Summary 5.3 Maintaining a Project * Working in Topic Branches