git
Differences
This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
| git [2026/07/08 22:43] – [checkout] jhagstrand | git [2026/08/06 07:54] (current) – [repository] jhagstrand | ||
|---|---|---|---|
| Line 52: | Line 52: | ||
| === bare=== | === bare=== | ||
| a bare repository is a folder named project.git\\ | a bare repository is a folder named project.git\\ | ||
| - | a non-bare repository is a subfolder | + | a non-bare repository is a sub-folder |
| - | git init | + | git init # executed from within a new project folder, creates the .git folder |
| - | git clone | + | git init --bare flash.git |
| + | | ||
| + | git clone < | ||
| ====remote==== | ====remote==== | ||
| Line 329: | Line 331: | ||
| By default diff compares all of the currently modified files. | By default diff compares all of the currently modified files. | ||
| - | git diff | + | git diff |
| - | git add . | + | git add . # staging |
| - | git diff HEAD # after the add | + | git diff HEAD # after staging |
| + | git diff --staged | ||
| Additional options. | Additional options. | ||
| Line 383: | Line 386: | ||
| https:// | https:// | ||
| + | |||
| + | ==== Combinations ==== | ||
| + | |||
| + | Some git command options effectively execute multiple git commands simultaneously. | ||
| + | Here are some examples. | ||
| + | |||
| + | 1. git add . | ||
| + | 2. git commit -m ' | ||
| + | 1+2. git -a commit -m ' | ||
| + | |||
| + | 1. git clone < | ||
| + | 2. git submodule init | ||
| + | 3. git submodule update | ||
| + | 2+3. git submodule update --init | ||
| + | 1+2+3. git clone --recursive-submodules < | ||
| + | |||
| + | 1. git fetch # download patch files | ||
| + | 2. git merge # apply patches to local files | ||
| + | 1+2. git pull # fetch and merge | ||
| + | |||
| + | ====Fork==== | ||
| + | In github ui, fork repo from voyc to hagstrand. | ||
| + | |||
| + | Locally: | ||
| + | git clone xttps:// | ||
| + | git remote add upstream xttps: | ||
| + | git pull --rebase upstream master | ||
| + | # pull does a fetch and merge into local directory. | ||
| + | git push origin master | ||
| + | Todo: Rename? | ||
| + | Todo: In github UI, “Pull Request” to bring forked project back into upstream. | ||
| + | |||
| + | |||
| ===== How to use ===== | ===== How to use ===== | ||
| Line 664: | Line 700: | ||
| git submodule update --init | git submodule update --init | ||
| - | ==== Combinations ==== | ||
| - | |||
| - | Some git command options effectively execute multiple git commands simultaneously. | ||
| - | Here are some examples. | ||
| - | |||
| - | 1. git add . | ||
| - | 2. git commit -m ' | ||
| - | 1+2. git -a commit -m ' | ||
| - | |||
| - | 1. git clone < | ||
| - | 2. git submodule init | ||
| - | 3. git submodule update | ||
| - | 2+3. git submodule update --init | ||
| - | 1+2+3. git clone --recursive-submodules < | ||
| - | |||
| - | 1. git fetch # download patch files | ||
| - | 2. git merge # apply patches to local files | ||
| - | 1+2. git pull # fetch and merge | ||
| - | |||
| - | ====Fork==== | ||
| - | In github ui, fork repo from voyc to hagstrand. | ||
| - | |||
| - | Locally: | ||
| - | git clone xttps:// | ||
| - | git remote add upstream xttps: | ||
| - | git pull --rebase upstream master | ||
| - | # pull does a fetch and merge into local directory. | ||
| - | git push origin master | ||
| - | Todo: Rename? | ||
| - | Todo: In github UI, “Pull Request” to bring forked project back into upstream. | ||
| - | ====See the current changes==== | ||
| - | git diff # before staging (git add *) | ||
| - | git diff --staged # after staging | ||
| ==== Remove a submodule ==== | ==== Remove a submodule ==== | ||
git.1783565029.txt.gz · Last modified: 2026/07/08 22:43 by jhagstrand