Guest User

Untitled

a guest
Feb 20th, 2018
301
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.85 KB | None | 0 0
  1. #### Cleaning
  2.  
  3. Show informations about remote branches:
  4. $ git remote show origin
  5.  
  6. Stop tracking deleted remote branches:
  7. $ git remote prune origin --dry-run
  8.  
  9.  
  10. #### Remote tracking
  11.  
  12. Verify origin and upstream setup:
  13. $ git remote -v
  14.  
  15. If upstream is missing, setup:
  16. $ git remote add upstream git@bitbucket.org:some-gatekeeper-maintainer/some-project.git
  17.  
  18. Collect changes of upstream repository:
  19. $ git fetch upstream
  20.  
  21. Checkout main branch (master):
  22. $ git checkout master
  23. And continue usual workflow:
  24. $ git pull upstream master || $ git merge upstream/master || $ git rebase upstream/master
  25.  
  26.  
  27. #### Lost and found
  28.  
  29. Look to log for what you lost:
  30. $ git reflog
  31.  
  32. Create new branch from what you found:
  33. $ git checkout -b branch-name 70b3696
  34.  
  35.  
  36. #### Unstage all local changes
  37.  
  38. To keep changes:
  39. $ git reset HEAD
  40.  
  41. To remove everything not commited permanently:
  42. $ git reset --hard HEAD
Add Comment
Please, Sign In to add comment