Post ArxSluvYU4IAwMrdMO by jani@fosstodon.org
(DIR) More posts by jani@fosstodon.org
(DIR) Post #ArxSltksqGA5Iyrb5U by jani@fosstodon.org
2025-03-06T10:08:00Z
0 likes, 0 repeats
I've got so many local in-progress development branches in my git repos that I've come up with a bunch of git aliases/scripts to manage them.'git rio' to rebase all branches against upstreams. If rebase fails on a branch, it'll call 'git todo-set', which will add a '-todo-YYYY-MM-DD' suffix to the branch name.'git todo' lists all the todo branches in chronological order. And finally, after I've manually fixed the rebase conflicts, 'git todo-unset' removes the todo suffix.#git
(DIR) Post #ArxSluvYU4IAwMrdMO by jani@fosstodon.org
2025-03-06T10:12:11Z
1 likes, 0 repeats
I also have 'git prefix-branch <prefix>' to add '<prefix>/' to branch name. For example, 'git prefix-branch attic' to name the current branch 'attic/branch-name'.I often use 'git prefix-branch delete' because AFAIK there isn't a neat way to delete the current branch. I thus move the branch to the recycle bin, so to speak, and throw them out later.#git