User Tools

Site Tools


snippets:git

Differences

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

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision
Previous revision
snippets:git [2018/03/09 15:37] allsparksnippets:git [2022/06/28 10:32] (current) allspark
Line 1: Line 1:
-# git push --force+# git 
 + 
 +https://github.com/github/gitignore 
 + 
 +https://sethrobertson.github.io/GitFixUm/fixup.html 
 + 
 +## git push --force
  
 ``` ```
Line 6: Line 12:
 ``` ```
  
-# remove last commit, but keep changes+## remove last commit, but keep changes
  
 ``` ```
Line 12: Line 18:
 ``` ```
  
-# tree on console+## tree on console
  
 ``` ```
Line 40: Line 46:
 ``` ```
  
 +## ignore changes in tracked file
 +
 +```
 +git update-index --assume-unchanged file
 +```
 +
 +To undo and start tracking again:
 +
 +```
 +git update-index --no-assume-unchanged [<file> ...]
 +```
 +
 +## split directory to new repo
 +
 +```
 +git filter-branch --prune-empty --subdirectory-filter FOLDER-NAME  BRANCH-NAME 
 +```
 +
 +## show staged diff
 +
 +```
 +git diff --cached
 +```
 +
 +## revert part of a commit
 +
 +```
 +git revert -n $bad_commit    # Revert the commit, but don't commit the changes
 +git reset HEAD .             # Unstage the changes
 +git add --patch .            # Add whatever changes you want
 +git commit                   # Commit those changes
 +```
 +
 +## delete remote branch
 +
 +```
 +git push origin --delete feature/login
 +```
snippets/git.1520606276.txt.gz · Last modified: by allspark