Skip to content

Update the outline #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jan 22, 2014
Merged

Update the outline #1

merged 9 commits into from
Jan 22, 2014

Conversation

ben
Copy link
Member

@ben ben commented Jan 7, 2014

Let's figure out what the 2nd edition is going to look like. Most of these tasks were imported from the TODO.

  • Credential Caching
  • Smart HTTP
  • Packfile / git protocol notes in Ch 9 or Appendix (won't affect the outline)
  • Notes
  • Better Reset documentation (three trees)
  • Environment variables
  • Tracking branch changes (won't affect the outline)
  • New GUIs - Windows, Mac
  • Eclipse integration
  • Visual Studio integration
  • Git replace
  • Updated submodule documentation and weaknesses (won't affect the outline)
  • Git bundle
  • rerere
  • Undoing merges
  • Rebase vs Merge (pros and cons)
  • git grep
  • git request-pull
  • git clean
  • git bash in contrib/
  • libgit2
    • some bindings examples?
  • GitHub chapter
    • flow
    • api
    • hub/gh
    • svn
    • pull request refs
  • Things in this post – GitHub
    • keyboard shortcuts
    • ignoring whitespace
    • commit ranges in urls
    • commits by author
    • .diff and .patch
    • email for notifications
    • mentions
    • GFM (autolinking)
    • hub/gh
  • Things in this post – git (these don't really need space in the outline, though)
    • git log -p
    • git log -S'pattern'
    • git add -p
    • git rm --cached FILE
    • git log ..BRANCH
    • git branch --[no-]merged
    • git branch --contains
    • git status -s
    • reflog
    • git shortlog -sn

@ben
Copy link
Member Author

ben commented Jan 8, 2014

What do you think so far?

@@ -44,6 +45,7 @@
* Changing Your Last Commit
* Unstaging a Staged File
* Unmodifying a Modified File
* Undoing All Changes
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm thinking maybe instead of the entire "Undoing Things" section it should roughly be replaced with the "Three Trees" explanation of the 'reset' command first and then dig into all these use cases of various types of undoing and redoing.

@@ -99,7 +111,7 @@
4.4 Setting Up the Server
4.5 Public Access
4.6 GitWeb
4.7 Gitosis
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like Gitosis is deprecated. I rearranged this section to be in "level" order; more sophisticated things come later. What do you think?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, Gitosis is irrelevant now. If we want to do something like this we should go with either Gitolite or GitLab (or possibly both).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not immediately obvious from where I left this comment, but Gitolite and GitLab are both still in there. We can revisit that later on, but my gut feeling is that both of them are relevant for different situations.

* GitHub Summary
4.X GitLab
4.X Gerrit
4.10 Other Hosting Options (bitbucket, stash, kiln, etc.)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added Gerrit here, some people think it's useful. Is there anything else we should cover in this section?

@ben
Copy link
Member Author

ben commented Jan 13, 2014

Apart from the last couple of questions, I think this is done. The only things left on the task list are specific commands we should mention, and I'll migrate those to issues when we're ready. Can you give it a full read-through to see if it feels right?

ben added a commit that referenced this pull request Jan 22, 2014
@ben ben merged commit 752d068 into master Jan 22, 2014
@ben
Copy link
Member Author

ben commented Jan 22, 2014

Merging this for now. We can always re-adjust later.

@ben ben deleted the updated-outline branch January 22, 2014 14:05
@ben ben mentioned this pull request Apr 1, 2014
4 tasks
@ben ben mentioned this pull request Apr 26, 2014
ben pushed a commit that referenced this pull request Oct 26, 2014
harupong added a commit to harupong/progit2 that referenced this pull request Nov 17, 2014
ben pushed a commit that referenced this pull request Aug 30, 2015
ben pushed a commit that referenced this pull request Jan 21, 2016
rogeriopradoj referenced this pull request in progit2-pt-br/progit2 Jan 24, 2017
Iniciando tradução dessa page
mestihudson pushed a commit to mestihudson/progit2-pt that referenced this pull request Apr 7, 2019
max123kl referenced this pull request in max123kl/progit2 Jul 25, 2019
Erster Versuch für Schreibweise und Übersetzung von Fachbegriffen.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants