diff options
Diffstat (limited to 'calculate.txt')
| -rw-r--r-- | calculate.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/calculate.txt b/calculate.txt index d37997353ca0..511fb1233c1f 100644 --- a/calculate.txt +++ b/calculate.txt @@ -7,6 +7,7 @@ 'uri': 'git://git.calculate-linux.org/calculate/calculate-overlay.git'}], 'status': 'unofficial'} $ pmaint sync calculate +*** syncing calculate 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: @@ -21,10 +22,8 @@ or --ff-only on the command line to override the configured default per invocation. From git://git.calculate-linux.org/calculate/calculate-overlay - 07223eae3..152f1f9f0 develop -> origin/develop - 07223eae3..152f1f9f0 update -> origin/update + 152f1f9f0..755d8685c develop -> origin/develop Already up to date. -*** syncing calculate *** synced calculate * Sync succeeded $ git log --format=%ci -1 |