-
Notifications
You must be signed in to change notification settings - Fork 19
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
git commit --amend #20
Comments
This happens because git-together passes the |
That is cool. I'm told that git-duet does the same thing. It is annoying for both tools =) |
In addition to adding multiple "Signed-off-by" lines, it also resets the committer variable. In the above commit, this would say something like "Larry committed with Larry" when it gets pushed to github and Todd would actually not be referenced. This seems like less than ideal to me. |
@kejadlen Would it be possible to go ahead and remove the --signoff when amend is in the argument list? Having it there is definitely causing us some pain. |
Yup, totally - this is high up on my todo list, but I haven't gotten around to working on git-together in a while. Next thing I do, I promise! :) |
Awesome, thank you :) |
Just a suggestion, if we don't alias the |
Add a config option, git-together.co-authored, which will switch git-together from using Signed-off-by to Co-authored-by. This makes it easier to support mobbing, as all authors are included in the commit message, and this is supported by GitHub (c.f. https://help.github.com/en/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors ). This is mutually exlusive with signing off commits - you have to choose one or the other. This is mostly because it doesn't make sense to include a single extra committer as the one who signed it off, but it also means that, in the event that a commit _must_ be signed off, e.g., when committing to the Linux Kernel, you don't lose information. This is a little fragile, as we are parsing multiple git options, and potentially reading from stdin, as there are at least six different ways to create a commit message in Git, four of which we care about, and two of which we should at least acknowledge, even though we don't modify them in any way. This also fixes kejadlen#20 by excluding --signoff from the list of args when using --amend.
Add a config option, git-together.co-authored, which will switch git-together from using Signed-off-by to Co-authored-by. This makes it easier to support mobbing, as all authors are included in the commit message, and this is supported by GitHub (c.f. https://help.github.com/en/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors ). This is mutually exlusive with signing off commits - you have to choose one or the other. This is mostly because it doesn't make sense to include a single extra committer as the one who signed it off, but it also means that, in the event that a commit _must_ be signed off, e.g., when committing to the Linux Kernel, you don't lose information. This is a little fragile, as we are parsing multiple git options, and potentially reading from stdin, as there are at least six different ways to create a commit message in Git, four of which we care about, and two of which we should at least acknowledge, even though we don't modify them in any way. This also fixes kejadlen#20 by excluding --signoff from the list of args when using --amend.
It appears that amend is adding multiple sign-offs.
Maybe this is due to the auto-rotation of the author and committer. We like the auto-rotation of the author and committer.
The text was updated successfully, but these errors were encountered: