Commit Diff

Commit:
d6074438efc7054965270a6317f8324583b7a02f
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
got pull could imply got update
Actions:
Patch | Tree
commit - 8913f07123caafdcc12dbef368c7adb12b3e26d9
commit + d6074438efc7054965270a6317f8324583b7a02f
blob - 4efb77bc061668a16658e1d80561528763adb67a
blob + 9b20b62260fcd32820f25a7d4ce6cf816d5ee49e
--- 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'
+        user may now run 'got update' (or perhaps just run implied 'got up')
       else:
         attempt server-style trivial-rebase of master onto origin/master
         if success: