From: Samuel Wales <samologist@gmail.com>
To: emacs-orgmode@gnu.org
Subject: git branch rename and git config q
Date: Sun, 5 Jun 2022 21:13:13 -0700 [thread overview]
Message-ID: <CAJcAo8uupUbLJTysb9nbMNO0THzOwv-4J+9jTeUyv3SSgVEVPA@mail.gmail.com> (raw)
org changed from master to main and maint to bugfix. this is a q
related to that.
for a clean repo, i figured out that i can do cd to repo, git checkout
master, git branch -m main.
i have a repo where i have patches that i carry along i a local
branch. these are rebased automagically when i upgrade org.
do i do git branch -m bugfix in my maint branch and then also
/manually/ change my git config to say bugfix instead of maint in
every place? and then checkout local again? will this preserve my
local branch with its rebased patches?
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "local"]
rebase = true
remote = origin
merge = refs/heads/maint
# merge = refs/heads/master
[branch "testrelease"]
remote = origin
merge = refs/heads/maint
[branch "maint"]
remote = origin
merge = refs/heads/maint
this is all from many years ago. upgrading in local will nicely
upgrade maint and put my patches on top in the local branch.
my goal is to upgrade my repo to the latest bugfix with my patches on
top and the same auto rebase setup. thanks!
next reply other threads:[~2022-06-06 4:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-06 4:13 Samuel Wales [this message]
2022-06-06 16:22 ` git branch rename and git config q 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
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
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=CAJcAo8uupUbLJTysb9nbMNO0THzOwv-4J+9jTeUyv3SSgVEVPA@mail.gmail.com \
--to=samologist@gmail.com \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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).