Commit Diff

Commit:
710504c4350395d77653d39e7cb5f9680c38e0a1
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
yeah let's imply update on pull
Actions:
Patch | Tree
commit - d6074438efc7054965270a6317f8324583b7a02f
commit + 710504c4350395d77653d39e7cb5f9680c38e0a1
blob - 9b20b62260fcd32820f25a7d4ce6cf816d5ee49e
blob + f5b5279a90abed6966ecb3d83397bc32259dec06
--- notes-pull-push
+++ notes-pull-push
@@ -28,7 +28,7 @@ got pull:
     set master -> origin/master
   if running in a worktree: {
       if fast-forward was possible:
-        user may now run 'got update' (or perhaps just run implied 'got up')
+        automatically run 'got update' ('got pull' implies 'got up')
       else:
         attempt server-style trivial-rebase of master onto origin/master
         if success: