From e7eaaee72c8f085ed6619962085f6075aea462c5 Mon Sep 17 00:00:00 2001 From: lkcl Date: Mon, 27 Jan 2020 13:31:49 +0000 Subject: [PATCH] --- HDL_workflow.mdwn | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/HDL_workflow.mdwn b/HDL_workflow.mdwn index c471b2d7d..acddfbfc4 100644 --- a/HDL_workflow.mdwn +++ b/HDL_workflow.mdwn @@ -302,6 +302,27 @@ Alternatively, the .ssh/config can be skipped and this used: git clone ssh://gitolite3@git.libre-riscv.org:922/REPONAME.git +# git configuration + +Although there are methods online which describe how (and why) these +settings are normally done, honestly it is simpler and easier to open +~/.gitconfig and add them by hand. + +core.autocrlf is a good idea to ensure that anyone adding DOS-formatted +files they don't become a pain. pull.rebase is something that is greatly +preferred for this project because it avoids the mess of "multiple +extra merge git tree entries", and branch.autosetuprebase=always will, +if you want it, always ensure that a new git checkout is set up with rebase. + + [core] + autocrlf = input + [push] + default = simple + [pull] + rebase = true + [branch] + autosetuprebase = always + # Checking out the HDL repositories * mkdir ~/src -- 2.30.2