From 04ac02a0795e17028661e9a5dfb4f7bdf9539381 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Apr 09 2018 21:10:57 +0000 Subject: ansible sop: recommend git 'pull.rebase' setting Using 'pull.rebase' avoids unneeded merge commits. --- diff --git a/docs/sysadmin-guide/sops/ansible.rst b/docs/sysadmin-guide/sops/ansible.rst index 4c55b68..1af0f4a 100644 --- a/docs/sysadmin-guide/sops/ansible.rst +++ b/docs/sysadmin-guide/sops/ansible.rst @@ -48,6 +48,12 @@ There are 2 git repositories associated with ansible: All commits are emailed to 'sysadmin-members' as well as announced on IRC in #fedora-noc. + It is recommended that you configure git to use ``pull --rebase`` by + default by running ``git config --bool pull.rebase true`` in your + ansible clone directory. This configuration prevents unneeded merges + which can occur if someone else pushes changes to the remote repository + while you are working on your own local changes. + /git/ansible-private on batcave01. This is a private repository for passwords and other sensitive data. It is not available in cgit, nor should it be cloned or copied remotely.