Git Command Line
- Thread starter cheepie
- Start date
Moving this to Command Line, where it will receive a more qualified audience.
Note that with text, it is better to cut and paste in the Code fields available as a choice in the dropdown menu in your Reply Pane toolbar. 3 dots and a down arrow, icon.
Are you on Kali? If not, which distro?
Cheers
Chris Turner
wizardfromoz
Note that with text, it is better to cut and paste in the Code fields available as a choice in the dropdown menu in your Reply Pane toolbar. 3 dots and a down arrow, icon.
Are you on Kali? If not, which distro?
Cheers
Chris Turner
wizardfromoz
OP is on MacOS if you check the terminal in their screenshot you will see that the paths differ from a GNU/Linux distribution.
Code:
/Users/sniper/cloned-Repo
Hold your horses @wizardfromoz - although it's not linux per-se, the thread could still be useful for other git users on Linux.org.
Personally, I haven't seen those messages from git before, so I'd need to look up what's causing the problem there.
In the meantime - @cheepie - If you cd into the root of the source tree for your project, what is the output of the command:
Personally, I haven't seen those messages from git before, so I'd need to look up what's causing the problem there.
In the meantime - @cheepie - If you cd into the root of the source tree for your project, what is the output of the command:
Bash:
git remote -vHa - goes to show how often I've used git recently...... Which is to say "Not much!"
I've just used git to update dwm on my work PC and got the warning message that @cheepie is getting.
That is apparently because git's behavior when pulling has changed.
Previously git would do a merge by default - unless the user specified another action. Apparently a lot of git users found this sub-optimal, and wanted a way to specify which action to take by default. So now you should specify the default action by setting one of the settings specified in the warning message.
So to get rid of the first warning message - about reconiling divergent branches - you need to run one of the following commands to set the default action for pulling:
That is the setting for the original, default "merge" option
That is the setting for "rebase"
Or
Which is the setting for "fast forward only" - which is apparently what many users prefer to use.
Personally, I've always been happy with "merge" by default.
NOTE: Using
If you want to apply it globally, then use
Choosing and setting one of the above settings will set the default action to use with
Also, once you've set the default action - if you ever need to override it and use another, you can specify it.
So, for example:
If you've explicitly set git pull to "merge" by default, globally. And you want to do a fast-forward in the repository you're working in. You can override pulls specified, default, global "merge" action like this:
And for that pull, you will use the "fast forward" action instead.
I've never seen the other error messages though.
From a quick bit of duckduckgo-fu, it seems to be related to an attempt to push to a non-bare repository.
Apparently github and gitlab repos are bare repositories.
I'm not sure what to suggest with this. I would need some information about @cheepie 's remote settings for their repo.
I've just used git to update dwm on my work PC and got the warning message that @cheepie is getting.
That is apparently because git's behavior when pulling has changed.
Previously git would do a merge by default - unless the user specified another action. Apparently a lot of git users found this sub-optimal, and wanted a way to specify which action to take by default. So now you should specify the default action by setting one of the settings specified in the warning message.
So to get rid of the first warning message - about reconiling divergent branches - you need to run one of the following commands to set the default action for pulling:
Bash:
git config pull.rebase false
Bash:
git config pull.rebase trueOr
Bash:
git config pull.ff onlyPersonally, I've always been happy with "merge" by default.
NOTE: Using
git config will only apply that setting to the repository you are currently in.If you want to apply it globally, then use
git config --global to set the setting instead.Choosing and setting one of the above settings will set the default action to use with
git pull and will prevent that warning message from appearing.Also, once you've set the default action - if you ever need to override it and use another, you can specify it.
So, for example:
If you've explicitly set git pull to "merge" by default, globally. And you want to do a fast-forward in the repository you're working in. You can override pulls specified, default, global "merge" action like this:
Bash:
git pull -ffI've never seen the other error messages though.
From a quick bit of duckduckgo-fu, it seems to be related to an attempt to push to a non-bare repository.
Apparently github and gitlab repos are bare repositories.
I'm not sure what to suggest with this. I would need some information about @cheepie 's remote settings for their repo.
Last edited:
this is linux terminal on mac!Thanks, my friend, missed that
@cheepie if this is not about Linux, we can't help.
Unless I hear a good reason from you otherwise, I'll close and then delete this Thread.
Wizard
