The way I like to see my git logs are with
git log --graph --oneline --all --decorate
Among other things that I found useful its output, there are the branch names. However, if I delete a branch, then the above does not display them anymore. I mean seeing a bunch of stuff like:
* 87c3294 (QueueExample) blah blah
is much more expressive (especially when the list becomes long) than a bunch of
* 87c3294 blah blah
The answers to this question and in particular this comment seems to imply that the branch names are still "somewhere".
How do I get them printed in the output of git log
or at least in some other way?
Alternatively, how can I remove branches from the output of git branch, while still keeping them around for purpose of git log
?
In Git, branches are simply pointers to a commit that move as new commits are added on that branch. In other words, once the pointer has moved, there is no memory that previous commits were on that branch. This was a hard concept for me to wrap my head around at first. Perhaps it's the name: "branch" makes me think of multiple nodes connected by edges, but in Git, a branch is really only a moving pointer to a node.
git log
dutifully annotates commits with any branch that is pointing to them. For example, I created a repo with commits "one", "two", and "three" on branch master and "uno", "dos", and "tres" on branch feature, then merged feature back into master. Here's whatgit log
tells me before I delete the branch:It's easy to get fooled into thinking that the "(feature)" annotation is somehow referring to that branch on the right, but it's not: it's just referring to the commit
523e2ac
.Note that, by default, when Git creates a merge commit (
9eb6e93
in our case), it automatically adds a comment stating that it's merging branch 'feature', so there is some record of there having been a branch there, but it's just a comment, nothing more.When I delete the branch 'feature', nothing changes except that commit
523e2ac
is no longer labeled with "(feature)":So, to answer your question, no, once you've deleted a branch, you cannot get
git log
to annotate a commit with that branch name (because it doesn't exist anymore). However, you have some alternatives:Don't delete the branch. There's no harm in leaving branches around, except that it clutters up your screen when you type
git branch
. Also, you may want to re-use branch names, which could cause problems later on if you don't delete your branches.Tag the commit before you delete the branch. A tag is really a branch that doesn't move. You can even make the tag name the same as the branch name.
Satisfy yourself with the automatic commenting of merge commits. As mentioned before, when Git does a merge, by default, it references the name of the branch being merged in in the commit comment, creating a record that the branch existed. To me, this is the cleanest solution, based on the way branches work in Git. Since a branch doesn't really refer to a series of commits, it's really only of historical consequence that a branch existed.
The other place that branch history may linger is your reflog, which simply logs what branches you're switching to/from. It's mostly there for disaster recovery (ooops, I didn't mean to delete that branch!), and it's not really useful for the kind of branch history you're talking about.
The comment is talking about merge commit messages, e.g.
Merge QueueExample into master
. When you delete a branch, the branch is gone. If you want to maintain a topical view of your log with--decorate
, try using tags instead (or don't delete the branch).Use
git log --merges
to list merge commits. The names of the deleted (but merged) branches will display along the names of the other merged branches.If you delete a branch in your local repo, it still exists in any other clones of that repo. If you push that deletion out to other repos, the branch itself (simply a conveniently named pointer to a specific commit) may cease to exist. However, the commit it pointed to will still be there for a while, even if absolutely nothing points to it. If it's been merged into other branches so that that commit forms the part of the ancestry of some other branch, then it will remain, as long as it's still reachable from an existing branch. Tracking it down, however, is a bit trickier. Early on, it'll be in your HEAD reflog for a while, but eventually it may disappear from there.
If you want them to always appear in
git log
output, then don't delete them. Or, replace branch pointers with tags to point at where the branch was before you removed it.