git diff -D oldBranchName newBranchName [subfolder or filename]
(-D does not show all the - lines for deleted files)
Christian Flach cmfcmf
🚂
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| My contribution allows tasks to be configured | |
| to run side by side in the same terminal: | |
| https://github.com/microsoft/vscode/pull/65973 |
cmfcmf
/ output.html
Created
December 8, 2015 08:31
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <!DOCTYPE html> | |
| <html lang="ru"> | |
| <head> | |
| <meta charset="utf-8"> | |
| <meta name="keywords" content="weather, world, Openstreetmap, weather, layer" /> | |
| <meta name="description" content="A layer with current weather conditions in cities for world wide" /> | |
| <meta name="domain" content="openweathermap.org" /> | |
| <meta http-equiv="pragma" content="no-cache" /> | |
| <meta http-equiv="Expires" content="-1" /> |
cmfcmf
/ regex.regex
Created
June 23, 2015 21:05
Find all not allowed PHP Annotations causing errors with Doctrine AnnotationReader
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @((?!(Annotation|Attribute|Attributes|Required|Target|fix|fixme|override|abstract|code|deprec|endcode|access|exception|final|ingroup|inheritdoc|inheritDoc|magic|name|toc|tutorial|private|static|staticvar|staticVar|throw|api|author|copyright|category|deprecated|example|filesource|global|ignore|internal|license|link|method|package|param|property|property-read|property-write|return|see|since|source|subpackage|throws|todo|TODO|usedby|uses|var|version|codeCoverageIgnore|codeCoverageIgnoreStart|codeCoverageIgnoreEnd|SuppressWarnings|noinspection|package_version|startuml|enduml)).)+ |
cmfcmf
/ gist:d2ed9a0f82b42b7416da
Last active
August 29, 2015 14:18
— forked from pitch-gist/gist:2999707
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <!doctype html> | |
| <title>Site Maintenance</title> | |
| <style> | |
| body { text-align: center; padding: 150px; } | |
| h1 { font-size: 50px; } | |
| body { font: 20px Helvetica, sans-serif; color: #333; } | |
| article { display: block; text-align: left; width: 650px; margin: 0 auto; } | |
| a { color: #dc8100; text-decoration: none; } | |
| a:hover { color: #333; text-decoration: none; } | |
| </style> |
cmfcmf
/ The answer to life the universe and everything + The number of horns on a unicorn + the loneliest number.txt
Last active
July 20, 2018 13:30
The answer to life the universe and everything + The number of horns on a unicorn + the loneliest number
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| https://www.google.de/search?q=the+answer+to+life+the+universe+and+everything+%2B+the+number+of+horns+on+a+unicorn+%2B+the+loneliest+number |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| { | |
| "name": "root/tmp", | |
| "require": { | |
| "symfony/finder": "*" | |
| }, | |
| "authors": [ | |
| { | |
| "name": "cmfcmf" | |
| } | |
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <?php | |
| $numbers = array(16,18,9,22,1,3,25,12,15,19,20); | |
| foreach ($numbers as $number) | |
| echo chr(64 + $number); |
cmfcmf
/ Cut video from Ubuntu command line
Last active
August 29, 2015 13:56
Cut video from Ubuntu command line, taken from here: http://askubuntu.com/a/59388/161884
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| mencoder -ss 00:30:00 -endpos 00:00:05 -oac copy -ovc copy originalfile -o newfile |
cmfcmf
/ Ubuntu - Bilder um die Hälfte verkleinern
Last active
January 4, 2016 15:09
Ubuntu - Bilder um die Hälfte verkleinern
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| mogrify -resize 50% -format jpg * |
NewerOlder