aboutsummaryrefslogtreecommitdiffhomepage
path: root/git.txt
diff options
context:
space:
mode:
authorjohannst <johannes.stoelp@gmail.com>2020-03-14 16:55:45 +0100
committerjohannst <johannes.stoelp@gmail.com>2020-03-14 16:55:45 +0100
commit7698c747d77fef20f1037057df263510b7c665bc (patch)
treeee9f25e0deb73dc9d62f30ee5c1d967ac416bc3e /git.txt
parentc8e14a3d5c8ca3aea06c9035308a1475cc70aa30 (diff)
downloadnotes-7698c747d77fef20f1037057df263510b7c665bc.tar.gz
notes-7698c747d77fef20f1037057df263510b7c665bc.zip
migrate git.txt + flatten hierarchy in SUMMARY
Diffstat (limited to 'git.txt')
-rw-r--r--git.txt104
1 files changed, 0 insertions, 104 deletions
diff --git a/git.txt b/git.txt
deleted file mode 100644
index 2616d65..0000000
--- a/git.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-# git
-------------------------------------------------------------------------------------------------------------------------
-
-# toc
- |remote|
- |branching|
- |resetting|
- |tags|
- |diff|
- |log|
- |inspection|
- |patching|
- |submodules|
- |revision_range|
-
- - *misc*
- git add -p [<file>] ......................... partial staging (interactive)
-
- - *remote*
- git remote -v ............................... list remotes verbose (with URLs)
- git remote show [-n] <remote> ............... list info for <remote> (like remote HEAD, remote branches,
- tracking mapping)
-
- - *branching*
- git branch [-a] ............................. list available branches; -a to include remote branches
- git branch -vv .............................. list branch & annotate with head sha1 & remote tracking branch
- git branch <bname> .......................... create branch with name <bname>
- git checkout <bname> ........................ switch to branch with name <bname>
- git push -u origin <rbname> ................. push branch to origin (or other remote), and setup <rbname> as
- tracking branch
-
- - *resetting*
- git reset [opt] <ref|commit>
- opt:
- --mixed ................................. resets index, but not working tree
- --hard .................................. matches the working tree and index to that of the tree being
- switched to any changes to tracked files in the working tree since
- <commit> are lost
- git reset HEAD <file> ....................... remove file from staging
- git reset --soft HEAD~1 ..................... delete most recent commit but keep work
- git reset --hard HEAD~1 ..................... delete most recent commit and delete work
-
- - *tags*
- git tag -a <tname> -m "descr" ............... creates an annotated tag (full object containing tagger, date, ...)
- git tag -l .................................. list available tags
- git checkout tag/<tname> .................... checkout specific tag
- git checkout tag/<tname> -b <bname> ......... checkout specific tag in a new branch
-
- - *diff*
- git diff HEAD:<fname> origin/HEAD:<fname> ... diff files for different refs
- git diff -U$(wc -l <fname>) <fname> ......... shows complete file with diffs instead of usual diff snippets
-
- - *log*
- git log --oneline ........................... shows log in single line per commit -> alias for '--pretty=oneline
- --abbrev-commit'
- git log --graph ............................. text based graph of commit history
- git log --decorate .......................... decorate log with REFs
-
- - *inspection*
- git ls-tree [-r] <ref> ...................... show git tree for <ref>, -r to recursively ls sub-trees
- git show <obj> .............................. show <obj>
- git cat-file -p <obj> ....................... print content of <obj>
-
- - *patching*
- git format-patch <opt> <since>/<revision range>
- opt:
- -N ...................................... use [PATCH] even with multiple patches (default is [PATCH n/m]
- where n is current commit num and m is total commit num in patch)
- --start-number <n> ...................... start output file generation with <n> as start number instead '1'
- since spcifier:
- -3 ...................................... e.g: create a patch from last three commits
- <comit hash> ............................ create patch with commits starting after <comit hash>
-
- git am <patch> .............................. apply patch and create a commit for it
-
- git apply --stat <PATCH> .................... see which files the patch would change
- git apply --check <PATCH> ................... see if the patch can be applied cleanly
- git apply <PATCH> ........................... apply the patch locally without creating a commit
-
- # eg: generate patches for each commit from initial commit on
- git format-patch -N $(git rev-list --max-parents=0 HEAD)
-
- # generate single patch file from a certain commit/ref
- git format-patch <COMMIT/REF> --stdout > my-patch.patch
-
- - *submodules*
- git submodule add <url> [<path>] ............ add new submodule to current project
- git clone --recursive <url> ................. clone project and recursively all submodules (same as using
- 'git submodule update --init --recursive' after clone)
- git submodule update --init --recursive ..... checkout submodules recursively using the commit listed in the
- super-project (in detached HEAD)
- git submodule update --remote <submod> ...... fetch & merge remote changes for <submod>, this will pull
- origin/HEAD or a branch specified for the submodule
-
- - *revision_range*
- HEAD ........................................ last commit
- HEAD~1 ...................................... last commit-1
- HEAD~N ...................................... last commit-N (linear backwards when in tree structure, check
- difference between HEAD^ and HEAD~)
- git rev-list --max-parents=0 HEAD ........... first commit
-
-------------------------------------------------------------------------------------------------------------------------
-vim:ft=help:sts=2:et:tw=120:cc=120:fo+=t
-