[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 648f759 2/2: Avoid a recurring problem with '
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 648f759 2/2: Avoid a recurring problem with 'git pull' |
|
Date: |
Wed, 14 Feb 2018 04:55:48 -0500 (EST) |
branch: master
commit 648f759e3d09273ccba0e51b5a70734864b40d2c
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Avoid a recurring problem with 'git pull'
Added 'git config pull.ff only' to instructions--see:
https://lists.nongnu.org/archive/html/lmi/2018-02/msg00097.html
---
README.schroot | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.schroot b/README.schroot
index f6128b9..b623788 100644
--- a/README.schroot
+++ b/README.schroot
@@ -299,6 +299,7 @@ schroot --chroot=cross-lmi
git config --global user.name "Gregory W. Chicares"
git config --global user.email address@hidden
git config --global color.ui auto
+git config --global pull.ff only
git config --global push.default simple
git config --global log.date iso8601-strict-local
git config --global log.follow true