Learn more about these different git repos.
Other Git URLs
I note on https://fedoraproject.org/wiki/Using_Fedora_GIT that there are plans to add a {{{ fedpkg pull }}} command. It's listed as a substitute for 'git pull' in the current approach.
It would be much better if this fedpkg command did a {{{ git pull }}} and a {{{ git rebase origin/<branch>/master }}} internally. This way, the remote updates will be pulled and then any local updates that the second maintainer has been working on will be applied on top of it. If there are merge conflicts, it will be addressed at this point.
This will also keep Fedora's repository free of useless "merge" commits.
This could probably be done in one step as 'git pull --rebase'
FWIW, I'm all for keeping as many useless merge commits out of the repos too. Many git users don't know to do this, let alone the many Fedora packagers who don't use git regularly.
After some discussion on IRC, I'm going to provide a --rebase option to the pull command, but not make it a default. This will keep things like git itself. I will mention rebase in the help text though.
Just added something I'll push today.
Login to comment on this ticket.