The Universe of Discourse : My Git Habits
10 weeks ago by emilsit
It's a lot of work to do this but it's worth it.
git
workflow
10 weeks ago by emilsit
gitster's journal - Resolving conflicts/dependencies between topic branches early
february 2009 by emilsit
Junio on how to maintain topic branches, bug fixes, and a workflow to avoid missing related fixes when merging between branches.
git
workflow
ff:git-world
february 2009 by emilsit
Converting a package to Git
january 2009 by emilsit
Martin Krafft explains how to do a clean git-svn import, rebase a git history on top of it, and convert patches to branches; with commands you can copy-paste. Plus a short bonus lesson on merging. In a Debian packaging context but still useful elsewhere.
svn
git-svn
reference
ff:git-world
subversion
git
workflow
january 2009 by emilsit
Packaging with Git
january 2009 by emilsit
A very detailed walkthrough from Martin Krafft on how to maintain a Debian package in git, tracking a git upstream. Includes discussion of branch usage showing examples for topics and integration, with commands you can run. Also the use of tags. Useful even for non-Debian work! From 2007; some git commands may have changed.
git
packaging
workflow
reference
ff:git-world
january 2009 by emilsit
gitster's journal - Never merging back
january 2009 by emilsit
Nice article on how to manage branches that have some changes that need to get merged back to master, and some that don't. These can be release branches or they can be branches targeted at specific customers.
git
workflow
ff:git-world
january 2009 by emilsit
My Git Workflow
january 2009 by emilsit
A nice post on different git workflows. The best part is about branch naming: "Using ‘origin’ as the name of your remote and ‘master’ as the name of your main branch is just the default settings git gives you. Neither name is magic. So, I renamed ‘origin’ to ‘github’ in .git/config to be explicit about where the code is going. Then, I created a new branch ‘development’ to reflect the code that is under the mainline of development."
git
workflow
tips
january 2009 by emilsit
Git Management | KernelTrap
july 2008 by emilsit
How to use "git rebase" with topic branches and the relative workflows used by leaf-developers versus subsystem maintainers and core integrators. The thoughts of Linus himself.
git
workflow
ff:git-world
july 2008 by emilsit
Copy this bookmark: