emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* git branch rename and git config q
@ 2022-06-06  4:13 Samuel Wales
  2022-06-06 16:22 ` Max Nikulin
  0 siblings, 1 reply; 11+ messages in thread
From: Samuel Wales @ 2022-06-06  4:13 UTC (permalink / raw)
  To: emacs-orgmode

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!


^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2022-06-09  0:24 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2022-06-09  0:09             ` Samuel Wales
2022-06-09  0:16               ` Samuel Wales
2022-06-09  0:23                 ` Samuel Wales

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).