Geek asks and answers

How to update .git / config on a remote server

I would like to configure persistent merges as the default for a repository that is already in the service. It means adding

  [merge]
          ff = false

to the repository file .git / config. Due to this metadata, I cannot expect it to be updated when I click the repo, as usual.

So, I cloned a bare repo, making changes and trying to get the result back to the server. Except that I cannot do any combination of arguments for "git push", I really do what I want.

Update: It seems that what I'm trying to describe is impossible (thanks to the folk patient on # git); I just have to encourage my developers to do this.

+3
source share
2 answers

ssh , , git ( !)

, hooks

+1

, "include" / :

git clone ...
git config include.path '../.gitconfig'

$ cat .gitconfig 
[merge]
    ff = false
[local]
    policy = true

$ git config -l | tail -3
include.path=../.gitconfig
merge.ff=false
local.policy=true

, ( local.policy post-checkout pre-commit).

, , . , ...

0

More articles:


All Articles