emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Tim Cross <theophilusx@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: git branch rename and git config q
Date: Thu, 09 Jun 2022 06:50:51 +1000	[thread overview]
Message-ID: <87edzyeue1.fsf@gmail.com> (raw)
In-Reply-To: <t7qi99$p6a$1@ciao.gmane.io>

Max Nikulin <manikulin@gmail.com> writes:

> I never used branch.*.rebase configuration. By the way, git-pull and git-config
> man pages a full of warnings related to this feature. I assume that source of
> configuration is
> https://orgmode.org/worg/org-faq.html#keeping-local-changes-current-with-Org-mode-development

+1. I find most 'automatic' git configurations more problematic and
dangerous than necessary. With a version control system, I think you
want maximum manual control. 

With regards to the issues Samual is running into, I would say take a
leaf from the hitch hikers guide to the galaxy and relax. This can
actually be a lot simpler than you realise. On some levels, I think you
may be over thinking it. 

When you do a git fetch it will pull down the new branch definitions for
you and you will be able to use them as you would any branch name to do
things like rebase your local branch against that branch. 

You can remove old remote definitions as outlined by Maxin. You can also
just ignore them. You will probably want to update your automatic rebase
configuration, but of course, as the old remotes are no longer being
used, it probably won't have any impact even if you just leave it in
place.  You will just need to do the rebasing manually, which I think is
a much better idea anyway. 

The only slight complication with the new branch names can arise if you
do push data up to those branches. Do you need to do that or is your use
case just as a consumer i.e. do you have write permission on the remote
org git repository at savannah? If you don't need to push your changes
back up, then you don't need to link your local branches with the remote

BTW I think Github has some pretty decent documentation about all of
this and some good examples on how you connect a local branch to a
remote one. You might find what they have and their examples useful. 

  reply	other threads:[~2022-06-08 21:08 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-06  4:13 git branch rename and git config q Samuel Wales
2022-06-06 16:22 ` Max Nikulin
2022-06-07  3:33   ` Samuel Wales
2022-06-07 15:24     ` Max Nikulin
2022-06-07 23:35       ` Samuel Wales
2022-06-08  2:10         ` Ihor Radchenko
2022-06-08 16:20           ` Max Nikulin
2022-06-08 20:50             ` Tim Cross [this message]
2022-06-09  0:09             ` Samuel Wales
2022-06-09  0:16               ` Samuel Wales
2022-06-09  0:23                 ` Samuel Wales

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87edzyeue1.fsf@gmail.com \
    --to=theophilusx@gmail.com \
    --cc=emacs-orgmode@gnu.org \


* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).