Skip to content

Instantly share code, notes, and snippets.

View munnerz's full-sized avatar

James Munnelly munnerz

  • Birmingham, United Kingdom
View GitHub Profile
@n00neimp0rtant
n00neimp0rtant / gist:9515611
Last active March 14, 2024 06:30
simple squash without rebase
## 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
/**
* Load all ressources needed for the current website.
*
* @param LoaderInterface $loader
*/
public function registerContainerConfiguration(LoaderInterface $loader)
{
// Load generic configuration
$loader->load(__DIR__.'/config/config.yml');