diff options
Diffstat (limited to '4nykey.txt')
| -rw-r--r-- | 4nykey.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/4nykey.txt b/4nykey.txt index 8c9f4ae9fac0..e287ceeeb1ac 100644 --- a/4nykey.txt +++ b/4nykey.txt @@ -11,6 +11,7 @@ {'type': 'git', 'uri': 'git@github.com:4nykey/4nykey.git'}], 'status': 'unofficial'} $ pmaint sync 4nykey +*** syncing 4nykey 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 4nykey *** synced 4nykey * Sync succeeded $ git log --format=%ci -1 |