This commit is contained in:
1 parent
2bfe616195
commit
6ee81d8784
1 file changed
+6
-4
@@ -11,6 +11,8 @@ tags:
|
|||||||
|
|
||||||
alrighty, this one's a real doozy. Strap in.
|
alrighty, this one's a real doozy. Strap in.
|
||||||
|
|
||||||
|
and as always, if you find an error or have feedback, please [let me know](/contact).
|
||||||
|
|
||||||
## versioning
|
## versioning
|
||||||
|
|
||||||
have you ever tried to revert to a previous version of a document in MS Office or Google Docs and found that your revision history is cluttered with small changes that by all rights should be grouped into one set of edits, but they aren't, and it's tedious to pick through all the versions?
|
have you ever tried to revert to a previous version of a document in MS Office or Google Docs and found that your revision history is cluttered with small changes that by all rights should be grouped into one set of edits, but they aren't, and it's tedious to pick through all the versions?
|
||||||
@@ -30,7 +32,7 @@ this walkthrough is best suited for people who want to use `git` in single-perso
|
|||||||
|
|
||||||
this walkthrough also focuses on the "happy path," without much discussion of troubleshooting. I may write more on the topic in the future, but we're already over *4,500 words*, so we're calling it a day.
|
this walkthrough also focuses on the "happy path," without much discussion of troubleshooting. I may write more on the topic in the future, but we're already over *4,500 words*, so we're calling it a day.
|
||||||
|
|
||||||
finally, I wrote this walkthrough primarily with knowledge from using **WSL** [more on this later] on **Windows** and with **Zed** as my text editor. While I've tried to cover my bases with other OSes and options, there's a solid chance I'm missing things!
|
finally, I wrote this walkthrough primarily with knowledge from using **WSL** [more on this later] on **Windows** and with **Zed** as my text editor, and I've since lightly reviewed from **Linux Mint** with **Gram** as my text editor. While I've tried to cover my bases with other OSes and options, there's a solid chance I'm missing things!
|
||||||
|
|
||||||
that all said, let's get (git?) into it!
|
that all said, let's get (git?) into it!
|
||||||
|
|
||||||
@@ -58,10 +60,10 @@ a CLI a way to interact with your computer and with software in text-only form.
|
|||||||
|
|
||||||
if you want to use the `git` CLI, you'll need a terminal. You've got a couple options here:
|
if you want to use the `git` CLI, you'll need a terminal. You've got a couple options here:
|
||||||
|
|
||||||
- on Linux or Mac, you should have one built in! This is the easy path, congrats :) Even better, `git` generally ships with these systems, so there's no installation required. Search for an application called 'Terminal' or similar
|
- on Linux or Mac, you should have one built in! This is the easy path, congrats :) Even better, `git` generally ships with these systems (or is a one-liner install such as `apt install git`). Search for an application called 'Terminal' or similar
|
||||||
- note that I don't have a Mac and have never used one. I can't guarantee that everything operates the same over there - there may be discrepancies I don't know about
|
- note that I don't have a Mac and have never used one. I can't guarantee that everything operates the same over there - there may be discrepancies I don't know about
|
||||||
- on Windows, there's two options
|
- on Windows, there's two options
|
||||||
- [`git` for Windows](https://gitforwindows.org/) packages a Linux-like terminal with a `git` GUI. This may be slightly friendlier for people who aren't at all familiar with Linux. If choosing `git` for Windows, [see my installation instructions below](#git-for-windows)
|
- [`git` for Windows](https://gitforwindows.org/) packages a Linux-like terminal with a `git` GUI. This is probably the friendlier option to get started with. If choosing `git` for Windows, [see my installation instructions below](#git-for-windows)
|
||||||
- I use [Windows Subsystem for Linux, or WSL](https://learn.microsoft.com/en-us/windows/wsl/install), which gives you a Linux distribution within Windows. It's pretty smooth sailing at this point, but there's some idiosyncracies to conquer - like the fact that your *Windows* files and your *Linux* files are stored in different places. If choosing WSL, [see my usage notes below](#wsl)
|
- I use [Windows Subsystem for Linux, or WSL](https://learn.microsoft.com/en-us/windows/wsl/install), which gives you a Linux distribution within Windows. It's pretty smooth sailing at this point, but there's some idiosyncracies to conquer - like the fact that your *Windows* files and your *Linux* files are stored in different places. If choosing WSL, [see my usage notes below](#wsl)
|
||||||
- both of the Windows options listed work with [Windows Terminal](https://apps.microsoft.com/detail/9n0dx20hk701) which offers a nicer-looking terminal experience than the basic command prompt. If you're going to keep working with what you set up today, I recommend it!
|
- both of the Windows options listed work with [Windows Terminal](https://apps.microsoft.com/detail/9n0dx20hk701) which offers a nicer-looking terminal experience than the basic command prompt. If you're going to keep working with what you set up today, I recommend it!
|
||||||
|
|
||||||
@@ -83,7 +85,7 @@ you can open `git` for Windows via the start menu by searching for 'git bash.' I
|
|||||||
while *installing* WSL is a single command, here's a couple notes about getting started once *inside* WSL:
|
while *installing* WSL is a single command, here's a couple notes about getting started once *inside* WSL:
|
||||||
|
|
||||||
- don't be concerned that you can't see anything when you type or paste your password! Since it's sensitive information, this is intentional. You'll notice this pattern a couple of times while following this walkthrough
|
- don't be concerned that you can't see anything when you type or paste your password! Since it's sensitive information, this is intentional. You'll notice this pattern a couple of times while following this walkthrough
|
||||||
- `Ctrl+C` and `Ctrl+V` won't work like they do on Windows. If you want to copy/paste, right-click (there won't be a context menu, it'll just happen)
|
- `Ctrl+C` and `Ctrl+V` won't work like they do on Windows. If you want to copy/paste, use `Shift+Ctrl+C` and `Shift+Ctrl+V`
|
||||||
- if you're downloading a text editor like the ones mentioned above, you'll still follow the *Windows* instructions
|
- if you're downloading a text editor like the ones mentioned above, you'll still follow the *Windows* instructions
|
||||||
|
|
||||||
you'll also need to be careful of a few things regarding text editors to make them work with WSL:
|
you'll also need to be careful of a few things regarding text editors to make them work with WSL:
|
||||||
|
|||||||
Reference in new issue
Block a user