emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

git branch rename and git config q


From: Samuel Wales
Subject: git branch rename and git config q
Date: Sun, 5 Jun 2022 21:13:13 -0700

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!



reply via email to

[Prev in Thread] Current Thread [Next in Thread]