As seen here:
$ (some_branch) git log
$ (some_branch) git rebase -i origin/master
| #!/usr/bin/env python3 | |
| """ | |
| Source: https://askubuntu.com/a/665899/640314 | |
| """ | |
| import subprocess | |
| # get the resolution of the screen (+0+0) | |
| res = [ | |
| int(n) for n in [ | |
| s.split("+")[0].split("x")\ |
As seen here:
$ (some_branch) git log
$ (some_branch) git rebase -i origin/master
| { | |
| "urls": [ | |
| "genealogy.stackexchange.com", | |
| "gardening.stackexchange.com", | |
| "skeptics.stackexchange.com", | |
| "gaming.stackexchange.com", | |
| "joomla.stackexchange.com", | |
| "politics.stackexchange.com", | |
| "magento.stackexchange.com", | |
| "interpersonal.stackexchange.com", |
| SELECT *, pg_size_pretty(total_bytes) AS total | |
| , pg_size_pretty(index_bytes) AS INDEX | |
| , pg_size_pretty(toast_bytes) AS toast | |
| , pg_size_pretty(table_bytes) AS TABLE | |
| FROM ( | |
| SELECT *, total_bytes-index_bytes-COALESCE(toast_bytes,0) AS table_bytes FROM ( | |
| SELECT c.oid,nspname AS table_schema, relname AS TABLE_NAME | |
| , c.reltuples AS row_estimate | |
| , pg_total_relation_size(c.oid) AS total_bytes | |
| , pg_indexes_size(c.oid) AS index_bytes |
git remote add upstream https://[upstream guy's repo url]
git fetch upstream
git reset --hard upstream/master