-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add copy commit attributes option #1833
Add copy commit attributes option #1833
Conversation
What should I do about the conflict in the auto-generated file? |
@mark2185 whenever I get conflicts in those I just arbitrarily resolve the conflicts (picking any hunk) and then re-generate the file |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice one! Left some feedback
I'm not even sure why it's conflicting, judging by the diff, only 1 line was added. But when I click |
@mark2185 not sure, I guess it's up to git to decide whether there's a conflict there |
It would seem I branched off at an earlier point in time than current |
Nice work @mark2185 . I've just done some local testing and I see that we're able to bring up the clipboard menu in the 'local' commits context, but not the reflog context or the sub-commits context. I think it might be a little confusing being able to press I think we need to add a 'controller factory' which adds the keybinding to each of the three contexts. In for _, context := range []controllers.Commitish{
gui.State.Contexts.LocalCommits,
gui.State.Contexts.ReflogCommits,
gui.State.Contexts.SubCommits,
gui.State.Contexts.Stash,
} {
controllers.AttachControllers(context, commitishControllerFactory.Create(context))
} that factory is defined in What do you reckon? |
Definitely.
I'll give it a shot and let you know how's it going! Thanks for all the assistance, it makes contributing much easier :D |
The feeling's mutual, you're making a big impact with all these contributions :) |
As discussed on slack, the wording of the controller factories (and the existence of said factories) was a little hard to follow, so I've refactored some things to make that a little more readable. At any rate I'll merge this PR now that tests are all green. Great work as usual :) |
I managed to close #1774 by accidentally overwriting the upstream with the wrong branch.