Messages in this thread | | | Date | Tue, 30 Apr 2013 16:34:03 -0700 | Subject | Re: [GIT] Security subsystem updates for 3.10 | From | Linus Torvalds <> |
| |
On Sun, Apr 28, 2013 at 7:48 PM, James Morris <jmorris@namei.org> wrote: > > Note: I can't figure out why the patch from Lai Jiangshan shows up twice > in the shortlog. Everything checks out otherwise.
Because you applied it twice. in two different branches.
It's there in both your "stage-for-3.10" and "ra-next" branch, commits 505f14f7b8d4 and 921f3ac4c3f2 respectively.
You then merged things in commit 9b0271d8ca4d ("Merge branch 'stage-for-3.10' of git://git.gitorious.org/smack-next/kernel into ra-next") and it all merged without any conflicts because the patches are identical and there wasn't any other work on top of it in either branch. But that doesn't change the fact that there are two distinct commits that just happen to have the same patch. So "git shortlog" will show it.
I would seriously suggest using gitk regularly (limit it to just your own stuff with something like "gitk origin.." or whatever) to see the history of what you've done visually as often as possible, not only does it show up very clearly if you do that, but it really helps to have a feel for what you've done.
Linus
| |