git commit --amend
professor opened this issue · 7 comments
It appears that amend is adding multiple sign-offs.
commit 1a9462c67aa33c012727241759d31f0b8c36dcb6
Author: Larry Hamel <lhamel@pivotal.io>
Date: Mon Jun 5 09:40:05 2017 -0700
add Gogland ide prefs
includes templates for ginkgo
Signed-off-by: Todd Sedano <professor@gmail.com>
Signed-off-by: Larry Hamel <lhamel@pivotal.io>
Maybe this is due to the auto-rotation of the author and committer. We like the auto-rotation of the author and committer.
This happens because git-together passes the --signoff command to commit and merge. (That's what adds the Signed-off-by text in the commit message.) A possible (and probably pretty safe) fix would be to not pass --signoff when --amend is in the argument list.
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 git with git-together, then git commit --amend will work. In most scenarios, only the first commit should use the git-together commit to rotate the author and committers. Thanks.