| receiving full stream of zssd/ztest@send2zscratch into zram/zssd/ztest@send2zscratch | |
| received 44.6K stream in 1 seconds (44.6K/sec) | |
| receiving full stream of zssd/ztest/lxd@send2zscratch into zram/zssd/ztest/lxd@send2zscratch | |
| received 53.1K stream in 1 seconds (53.1K/sec) | |
| receiving full stream of zssd/ztest/lxd/snapshots@send2zscratch into zram/zssd/ztest/lxd/snapshots@send2zscratch | |
| received 43.5K stream in 1 seconds (43.5K/sec) | |
| receiving full stream of zssd/ztest/lxd/custom-snapshots@send2zscratch into zram/zssd/ztest/lxd/custom-snapshots@send2zscratch | |
| received 43.5K stream in 1 seconds (43.5K/sec) | |
| receiving full stream of zssd/ztest/lxd/containers@send2zscratch into zram/zssd/ztest/lxd/containers@send2zscratch | |
| received 50.2K stream in 1 seconds (50.2K/sec) |
| receiving full stream of zssd/ztest@send2zscratch into zram/zssd/ztest@send2zscratch | |
| received 44.6K stream in 1 seconds (44.6K/sec) | |
| receiving full stream of zssd/ztest/lxd@send2zscratch into zram/zssd/ztest/lxd@send2zscratch | |
| received 53.1K stream in 1 seconds (53.1K/sec) | |
| receiving full stream of zssd/ztest/lxd/snapshots@send2zscratch into zram/zssd/ztest/lxd/snapshots@send2zscratch | |
| received 43.5K stream in 1 seconds (43.5K/sec) | |
| receiving full stream of zssd/ztest/lxd/custom-snapshots@send2zscratch into zram/zssd/ztest/lxd/custom-snapshots@send2zscratch | |
| received 43.5K stream in 1 seconds (43.5K/sec) | |
| receiving full stream of zssd/ztest/lxd/containers@send2zscratch into zram/zssd/ztest/lxd/containers@send2zscratch | |
| received 50.2K stream in 1 seconds (50.2K/sec) |
| receiving full stream of zssd/ztest@send2zscratch into zram/zssd/ztest@send2zscratch | |
| received 44.6K stream in 1 seconds (44.6K/sec) | |
| receiving full stream of zssd/ztest/lxd@send2zscratch into zram/zssd/ztest/lxd@send2zscratch | |
| received 53.1K stream in 1 seconds (53.1K/sec) | |
| receiving full stream of zssd/ztest/lxd/snapshots@send2zscratch into zram/zssd/ztest/lxd/snapshots@send2zscratch | |
| received 43.5K stream in 1 seconds (43.5K/sec) | |
| receiving full stream of zssd/ztest/lxd/custom-snapshots@send2zscratch into zram/zssd/ztest/lxd/custom-snapshots@send2zscratch | |
| received 43.5K stream in 1 seconds (43.5K/sec) | |
| receiving full stream of zssd/ztest/lxd/containers@send2zscratch into zram/zssd/ztest/lxd/containers@send2zscratch | |
| received 50.2K stream in 1 seconds (50.2K/sec) |
| .dhx_checkbox__input, | |
| .dhx_radiobutton__input, | |
| .dhx_simplevault__input, | |
| .dhx_visually-hidden { | |
| position: absolute; | |
| overflow: hidden; | |
| clip: rect(0 0 0 0); | |
| height: 1px; | |
| width: 1px; | |
| margin: -1px; |
| git merge --no-commit other-branch && git checkout other-branch -- . && git commit | |
| ### https://twitter.com/adymitruk/status/69479850846593024 | |
| # We needed this once after some intense debugging on the staging branch. We knew | |
| # staging was correct and wanted to merge staging -> production and be sure that | |
| # prod branch never "won" any conflicts |
| CREATE TABLE IF NOT EXISTS `country` ( | |
| `id` int(11) NOT NULL AUTO_INCREMENT, | |
| `iso` char(2) NOT NULL, | |
| `name` varchar(80) NOT NULL, | |
| `nicename` varchar(80) NOT NULL, | |
| `iso3` char(3) DEFAULT NULL, | |
| `numcode` smallint(6) DEFAULT NULL, | |
| `phonecode` int(5) NOT NULL, | |
| PRIMARY KEY (`id`) | |
| ) ENGINE=MyISAM DEFAULT CHARSET=latin1; |
| <!DOCTYPE html> | |
| <html lang="en"> | |
| <head> | |
| <meta http-equiv="content-type" content="text/html; charset=UTF-8"> | |
| <meta charset="utf-8"> | |
| <title>Bootply snippet - Bootstrap </title> | |
| <meta name="generator" content="Bootply" /> | |
| <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> | |
| <meta name="description" content="Bootstrap example." /> | |
| <link href="//maxcdn.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css" rel="stylesheet"> |
I will maybe someday get around to dusting off my C and making these changes myself unless someone else does it first.
Imagine a long-running development branch periodically merges from master. The
git log --graph --all --topo-order is not as simple as it could be, as of git version 1.7.10.4.
It doesn't seem like a big deal in this example, but when you're trying to follow the history trails in ASCII and you've got several different branches displayed at once, it gets difficult quickly.