commit ab7a017fa8c904b65810c03adac89d71d1546102
from: Stefan Sperling <stsp@stsp.name>
date: Wed Aug 14 15:15:57 2019 UTC

clarify what auto-push is for

commit - 0e11765d9d4fd6b0493f356b3c4ad314ce7b2433
commit + ab7a017fa8c904b65810c03adac89d71d1546102
blob - bded0b757e1e36f5f2afe70832ee5dd8bb3d7607
blob + 8f5e79b70dde62b1345c9197743d73aecade81a6
--- notes-pull-push
+++ notes-pull-push
@@ -47,19 +47,24 @@ got push:
 
 ---
 
-"push by default" commit (default for master branch and other important
-branches on central server):
+"push by default" commits allow for "branchless" development (committing
+local changes against a central server and local repo at the same time)
 
 got checkout
 
 work work work
 
+get OKs of your local changes!
+
+got OKs?
+(optionally: stage OK'd changes with 'got stage')
 got commit
    create temp commit object; attempt push + trivial-rebase on server
    if success:
      temp commit becomes new head of local master
      optionally, user may run 'got pull' to rebase local version of master
    else:
+     (require unstage if changes were staged)
      require got pull
      try to commit again