diff options
Diffstat (limited to 'emacs.txt')
| -rw-r--r-- | emacs.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/emacs.txt b/emacs.txt index 066024ccf9b8..e7b5c29f26e6 100644 --- a/emacs.txt +++ b/emacs.txt @@ -17,6 +17,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/proj/emacs.git'}], 'status': 'official'} $ pmaint sync emacs +*** syncing emacs 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: @@ -31,7 +32,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing emacs *** synced emacs * Sync succeeded $ git log --format=%ci -1 |