[remote] Intialize Remote Repo:
# ssh into remote
# initialze empty repo
git init
[local] Setup Local:
# where "user@ip:/path/to/repo.git" is your specific remote user, ip, and path
<?php | |
// The Story: | |
// | |
// PHP's cli server (`php -S localhost:7777`) treats dots (`.`) in paths | |
// as a stataic file request... | |
// Many seem to consider this a bug, except the PHP-powers-that-be | |
// see: https://bugs.php.net/bug.php?id=61286 | |
// So... | |
// Turns out there's a workaround |
// clone the repo into remote | |
// note: trailing `.` is for cloning without parnet dir | |
git clone -b BRANCH-NAME --single-branch REPO-SSH-OR-HTTPS-PATH . |
[remote] Intialize Remote Repo:
# ssh into remote
# initialze empty repo
git init
[local] Setup Local:
# where "user@ip:/path/to/repo.git" is your specific remote user, ip, and path
Resolving merge conflicts
git checkout --ours index.html
git checkout --theirs _layouts/default.html
Remove files from repo after Adding to gitignore
Better git logs, aliased to git lg
src: https://coderwall.com/p/euwpig/a-better-git-log
git config --global alias.lg "log --graph --pretty=format:'%C(auto)%h -%d %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"