emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Max Nikulin <manikulin@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: git branch rename and git config q
Date: Tue, 7 Jun 2022 22:24:02 +0700	[thread overview]
Message-ID: <t7nqik$14h7$1@ciao.gmane.io> (raw)
In-Reply-To: <CAJcAo8vpc7Pn8PP9xV=NUj5LC=s98hD12Mw+zzGdHFtdKn7jXg@mail.gmail.com>

On 07/06/2022 10:33, Samuel Wales wrote:
> the last par of your email makes it seem as if i should do a git
> [interactive?] rebase operation from [top of] local on bugfix, even
> though it is already rebasing on maint each upgrade.  would that be a
> good description of what you meant?

The state of your local repository is unclear for me. Maybe
     git remove -v show
     git branch -r -v
will shed some light.

maint branch existed in the repository hosted at orgmode.org. During 
migration to savannah it was renamed to bugfix, so if earlier you 
rebased local branches onto maint as the release branch, you should use 
bugfix (from savannah) now.

Your "local" branch has "rebase" setting, I am unsure concerning its 
precise meaning. I usually do not set any remote for local branches and 
explicitly specify target commit every time I need to rebase them.

> do i do git branch -m bugfix in my maint branch

This renames just your local branch but should not affect its 
association with remote (orgmode.org) branch. From my point of view it 
just increases confusion. Add new remote, checkout bugfix branch (it 
will track the branch from proper remote repository), then rebase your 
local modifications onto bugfix. You can use "git rebase REMOTE/bugfix" 
(I do not know your remote names, replace REMOTE to the name of the 
savannah repository). Target branch name for rebase is no more than 
convenient way to specify particular commit.

  reply	other threads:[~2022-06-07 15:25 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 [this message]
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
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='t7nqik$14h7$1@ciao.gmane.io' \
    --to=manikulin@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).