Eric Stroczynski estroz

## gist:5bf5686bae86b8129bee

      
              1 file
            
          
              147 forks
            
          
              40 comments
            
          
              559 stars
            
          
                chrissimpkins
                / gist:5bf5686bae86b8129bee
            
            
              Last active
              March 6, 2023 00:10
            
              
                Atom Editor Cheat Sheet: macOS
              
          
    Use these rapid keyboard shortcuts to control the GitHub Atom text editor on macOS.

Key to the Keys


⌘ : Command key
⌃ : Control key
⌫ : Delete key
← : Left arrow key
→ : Right arrow key
↑ : Up arrow key


## gist:9515611
## within current branch, squashes all commits that are ahead of master down into one
## useful if you merged with upstream in the middle of your commits (rebase could get very ugly if this is the case)

## commit any working changes on branch "mybranchname", then...
git checkout master
git checkout -b mybranchname_temp
git merge --squash mybranchname
git commit -am "Message describing all squashed commits"
git branch -m mybranchname mybranchname_unsquashed
git branch -m mybranchname
	## within current branch, squashes all commits that are ahead of master down into one
	## useful if you merged with upstream in the middle of your commits (rebase could get very ugly if this is the case)

	## commit any working changes on branch "mybranchname", then...
	git checkout master
	git checkout -b mybranchname_temp
	git merge --squash mybranchname
	git commit -am "Message describing all squashed commits"
	git branch -m mybranchname mybranchname_unsquashed
	git branch -m mybranchname