User Tools

Site Tools


learn

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Next revision
Previous revision
Last revision Both sides next revision
learn [2022/06/26 08:18]
dblume created
learn [2022/06/27 14:39]
dblume
Line 5: Line 5:
 ===== Git ===== ===== Git =====
  
-[[https://fle.github.io/git-tip-keep-your-branch-clean-with-fixup-and-autosquash.html|fixup and squash]]+See [[git]] for general notes. 
 + 
 +[[https://fle.github.io/git-tip-keep-your-branch-clean-with-fixup-and-autosquash.html|fixup and squash]] for appending fixes to commits you already made.
  
   * ''git commit --fixup <commit>'': automatically marks your commit as a fix of a previous commit   * ''git commit --fixup <commit>'': automatically marks your commit as a fix of a previous commit
   * ''git rebase -i --autosquash'': automatically organize merging of these fixup commits and associated normal commits   * ''git rebase -i --autosquash'': automatically organize merging of these fixup commits and associated normal commits
  
-^ Command ^ Notes ^ +[[https://git-scm.com/docs/git-stash|stash]] for stashing your local changes away. You can ''push'' and ''pop'' stashes.
-| ''git commit --fixup <commit>'' | automatically marks your commit as a fix of a previous commit | +
-| ''git rebase -i --autosquash'' | automatically organize merging of these fixup commits and associated normal commits | +
- +
-[[https://git-scm.com/docs/git-stash|stash]]+
  
 ===== Vim ===== ===== Vim =====
  
-Autocomplete+==== Autocomplete ====
  
-Navigation+^ Command ^ Notes ^ 
 +| ''c-p'', ''c-n'' | Autocomplete Previous or Next match, Also navigate completion menu. | 
 +| ''c-y'', ''c-e'' | Accept or cancel the autocompletion | 
 +| ''c-x,c-]'', ''c-x,c-o'' | Autocomplete from tags or from Omnicomplete. Close with ''c-w,c-z'' or '':pc''
 + 
 +=== Navigation === 
 + 
 +^ Command ^ Notes ^ 
 +| ''c-e'' | Scroll down (text goes up) | 
 +| ''zz'' | Scroll current line to center. | 
 +| ''c-y'' | Scroll up (text goes down) | 
 + 
 +^ Command ^ Notes ^ 
 +| ''%%[[%%'' | Go to previous "{" on first column. ('']]'' goes to next one.) | 
 +| ''[{'' | Go to enclosing "{"
 +| '']}'' | Go to enclosing "}"
 +| ''{'' | Go to previous blank line | 
 +| ''}'' | Go to next blank line |
learn.txt · Last modified: 2022/06/30 09:54 by dblume