basic features

[Akuli]

• [ ] Why git: https://www.youtube.com/watch?v=4XpnKHJAok8

Setup etc:

• [x] Installing git
• [x] What does $ foo mean in this tutorial

Basics:

• [x] How to make repo
  • [x] git clone, why to avoid git init
  • [x] license
  • [x] gitignore
• [ ] You should always-ish save in editor?
• [x] The basic steps: add, commit, push
  • [ ] Configuring the thing that remembers the password when you push frequently

Looking at wtf is going on:

• [x] git status
• [x] git diff
• [x] git diff --staged (or --cached in older git versions)
• [x] git log --oneline --all --graph, and making an alias for it

Working with other people:

• [ ] How to invite another collaborator
• [ ] What to do when the collaborators try to push conflicting changes

Pull requests:

• [ ] How to decide whether you should use pull requests (to me, is the repo new or is there already a lot of code to maintain, but mention other opinions)
• [ ] How to make a basic pull request: git checkout -b branchname, git push --set-upstream origin
  • [x] Remember to first pull on main
    • [ ] what if you forget?
    • [ ] what if you want to make a pull request based on another pull request? see merging main into pr below
  • [x] How to fork the repo and add your fork as a new remote, in case you were not invited (skipped, not how I ended up doing it)
• [x] How to review a pull request
• [x] Merging main into the PR to make it based on latest main
  • [ ] Mention rebase?
• [x] The "squash and merge" button
• [x] Deleting the branch after merging (local and remote)

Things that the top stackoverflow answer gets wrong:

• [ ] stackoverflow-recommended git reset --hard HEAD^ is generally not as safe as git revert

[Akuli]

@PurpleMyst I'd be interested in what you think about this plan.

[PurpleMyst]

I like it, but I'm not sure why git init is bad? I use it

[Akuli]

If you use git init with a github repo, you will also need to know how to git remote add origin https://github.com/username/repo and then tell git pull to merge the unrelated histories. It's not terribly complicated, but it's certainly more work than a single git clone command.

[PurpleMyst]

Makes sense. Usually, when I've git init-ed a repo locally, I make the repo remote on GitHub be empty and make any licenses/gitignores manually