Quentin Machu Quentin-M

## devops_best_practices.md

      
              1 file
            
          
              154 forks
            
          
              18 comments
            
          
              669 stars
            
          
                jpswade
                / devops_best_practices.md
            
            
              Last active
              May 3, 2024 11:49
            
              
                Devops Best Practices Checklist
              
          
    Find the original here article here: Devops Best Practices

DevOps started out as "Agile Systems Administration". In 2008, at the Agile Conference in Toronto, Andrew Shafer posted an offer to moderate an ad hoc "Birds of a Feather" meeting to discuss the topic of "Agile Infrastructure". Only one person showed up to discuss the topic: Patrick Debois. Their discussions and sharing of ideas with others advanced the concept of "agile systems administration". Debois and Shafer formed an Agile Systems Administrator group on Google, with limited success. Patrick Debois did a presentation called "Infrastructure and Operations" addressing

  
## 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