URL: https://github.com/freeipa/freeipa/pull/716
Title: #716: Fix minor typos
realsobek commented:
"""
Thank you for guiding me. :)
Post by abbraThere are no tickets associated with these changes.
In the sense of:
http://www.freeipa.org/page/Contribute/Code#Update_Trac_ticket
I consider my code changes small and omitted the ticket.
Shall I create a ticket to associate the changes with?
Post by abbraDo not change --forwarder-* to --forward-* because you are dealing with well-known DNS term here, not a simple word.
As far as I can see in FreeIPA there is no '--forwarder-policy' option. '--forward-policy' and '--forwarder' options are present.
Post by abbraPlease normalize your From: line to be from the same email address.
That is my fault.
It is fixed in my fork now, but the change is not reflected in the pull request. How can I fix this?
What I did to fix the author of the commit on my computer:
$ cd freeipa ; git checkout fix-uk-forwarder-policy
$ git log # output has been shortened manually
commit 2c3db7b6645868d8d41b8bf6039228214f4f6660
realsobek
add empty lines to be consistent
commit cb4250afda73a1ad3b3fb1d8a94f04b6dd944c72
user
use correct option name
commit 703691c605b39e08ce3aff4623c90edafa0bca53
realsobek
fix minor typo in ipa-adtrust-install.1
$ git rebase -i -p 703691c605b39e08ce3aff4623c90edafa0bca53 # change file to:
edit cb4250af
keep 2c3db7b6
Stopped at cb4250afda73a1ad3b3fb1d8a94f04b6dd944c72...
$ git commit --amend --reset-author
[detached HEAD 23a1023] use correct option name
1 file changed, 4 insertions(+), 4 deletions(-)
$ git rebase --continue
Successfully rebased and updated refs/heads/fix-uk-forwarder-policy.
$ git log # output has been shortened manually
commit 7aa5ce36bd98dd8bafa06fe962ae994cad585c51
realsobek
add empty lines to be consistent
commit 23a1023100c969e2d3b2482f991a707349233bd0
realsobek
use correct option name
commit 703691c605b39e08ce3aff4623c90edafa0bca53
realsobek
fix minor typo in ipa-adtrust-install.1
$ git commit -a
On branch fix-uk-forwarder-policy
Your branch and 'origin/fix-uk-forwarder-policy' have diverged,
and have 2 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
nothing to commit, working directory clean
$ git push
To https://github.com/realsobek/freeipa.git
! [rejected] fix-uk-forwarder-policy -> fix-uk-forwarder-policy (non-fast-forward)
error: failed to push some refs to 'https://github.com/realsobek/freeipa.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
$ git push -f
Counting objects: 8, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (8/8), 892 bytes | 0 bytes/s, done.
Total 8 (delta 6), reused 3 (delta 3)
remote: Resolving deltas: 100% (6/6), completed with 3 local objects.
To https://github.com/realsobek/freeipa.git
+ 2c3db7b...7aa5ce3 fix-uk-forwarder-policy -> fix-uk-forwarder-policy (forced update)
Post by abbraUpdates to translations should be done via ...
I will do after the '--forwarder-policy' discussion is resolved.
Post by abbraChange like plugable -> pluggable ...
No normal sentence, it is all code.
Maybe it can be changed in the future with the release of a major new version?
"""
See the full comment at https://github.com/freeipa/freeipa/pull/716#issuecomment-294603758