diff options
Diffstat (limited to 'liftm.txt')
| -rw-r--r-- | liftm.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/liftm.txt b/liftm.txt index a63c9f26429a..15fd0faabc9a 100644 --- a/liftm.txt +++ b/liftm.txt @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@github.com/jcaesar/liftm-overlay.git'}], 'status': 'unofficial'} $ pmaint sync liftm +*** syncing liftm warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing liftm *** synced liftm * Sync succeeded $ git log --format=%ci -1 |