search

Branchout / branchout

A manyrepo management tool to allow for local monorepo projecting while keeping everything in distinct repositories
Apache License 2.0
9 stars 2 forks source link

Don't force pull behaviour, respect users settings for their use and preferences #71

Open fredcooke opened 3 years ago

fredcooke commented 3 years ago 
~/repos/public/branchout$ grep -n "git pull" br*
branchout-group:27:      echo -e "\\033[0m${2}\\033[31m${projectGroup}\\033[0m \\033[70D\\033[70C\\033[1m $( git pull --rebase origin 2>&1| head -n1)\\033[0m"
branchout-group:38:   elif git pull --rebase origin > /dev/null 2>&1; then
branchout-project:43:      echo -e "\\033[0m${2}\\033[31m${projectGroup}/${1}\\033[0m \\033[70D\\033[70C\\033[1m $( git pull --rebase origin 2>&1| head -n1)\\033[0m"
branchout-project:52:  if git pull --rebase origin > /dev/null 2>&1; then

None of these commands should use --rebase - if the user says pull, pull, if they want rebase they'll have it configured in their ~/.gitconfig or in every repo with the setting that automates that. I don't ever want to pull --rebase, period. I do want to rebase after fetching IF I have diverged AND I'm not going to force master back to where it should be. My settings have this:

[pull]
        ff = only

Ie, fast forward, or fail. As it should be. But I don't want to enforce my beliefs on others in the world unless I'm working directly with them on the same repos :-D