Messages in this thread | | | Date | Wed, 1 May 2013 12:37:23 +1000 (EST) | From | James Morris <> | Subject | Re: [GIT] Security subsystem updates for 3.10 |
| |
On Tue, 30 Apr 2013, Linus Torvalds wrote:
> 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.
I don't have a stage-for-3.10 branch in my tree -- this must have come in via the smack tree.
> 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.
Thanks. Will do.
- James -- James Morris <jmorris@namei.org>
| |