My fork of avoinministerio is not up-to-date but "git push" claims it is

gistfile1.txt

jyrki@Jyrki:/mnt/data/Avoin Ministerio/avoinministerio$ git pull avoinministerio master
remote: Counting objects: 7634, done.
remote: Compressing objects: 100% (2123/2123), done.
remote: Total 7527 (delta 5322), reused 7420 (delta 5218)
Receiving objects: 100% (7527/7527), 1.38 MiB | 191 KiB/s, done.
Resolving deltas: 100% (5322/5322), completed with 26 local objects.
From github.com:avoinministerio/avoinministerio
 * branch            master     -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: Fixed: invalid vote counts were still possible. Idea#update_vote_counts didn't take into account that the option parameter is a string rather than an integer. I also fixed tests: now the tests use a string instead of an integer as the parameter.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Added a new link into the footer and split the footer into two lines.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Attempted to fix a crash that occurs in staging. Disabled validation in the database migration to make sure that all ideas will have a value for updated_content_at. Disabled timestamp recording while migrating the database to keep the migration from changing updated_at of every single idea.
Using index info to reconstruct a base tree...
<stdin>:28: trailing whitespace.
    
warning: 1 line adds whitespace errors.                                               
Falling back to patching base and 3-way merge...                                      
No changes -- Patch already applied.
jyrki@Jyrki:/mnt/data/Avoin Ministerio/avoinministerio$ git pull
First, rewinding head to replay your work on top of it...
Applying: Trying to fix search limiting of Citizens just for those who have published_something? (fix away from published?)
Using index info to reconstruct a base tree...
<stdin>:254: trailing whitespace.
# Real syncing of citizens into MailChimp ** AFTER some date ** 
<stdin>:288: trailing whitespace.
 
<stdin>:1377: trailing whitespace.

<stdin>:1752: trailing whitespace.

<stdin>:2204: trailing whitespace.

warning: squelched 414 whitespace errors
warning: 419 lines add whitespace errors.
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Trying to fix search limiting of Citizens just for those who have published_something? (fix away from published?)
Using index info to reconstruct a base tree...
<stdin>:254: trailing whitespace.
# Real syncing of citizens into MailChimp ** AFTER some date ** 
<stdin>:288: trailing whitespace.
 
<stdin>:1377: trailing whitespace.

<stdin>:1752: trailing whitespace.

<stdin>:2204: trailing whitespace.

warning: squelched 414 whitespace errors
warning: 419 lines add whitespace errors.
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
jyrki@Jyrki:/mnt/data/Avoin Ministerio/avoinministerio$ git push
Everything up-to-date

It worked when I disabled pull.rebase :)

jyrki@Jyrki:/mnt/data/Avoin Ministerio/avoinministerio$ git config pull.rebase false
jyrki@Jyrki:/mnt/data/Avoin Ministerio/avoinministerio$ git pull avoinministerio master
From github.com:avoinministerio/avoinministerio
 * branch            master     -> FETCH_HEAD
Merge made by the 'recursive' strategy.
jyrki@Jyrki:/mnt/data/Avoin Ministerio/avoinministerio$ git push
Counting objects: 7324, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (1786/1786), done.
Writing objects: 100% (7048/7048), 690.64 KiB, done.
Total 7048 (delta 5217), reused 6902 (delta 5101)
To [email protected]:jyrkive/avoinministerio.git
   7cebafc..2c3bde2  master -> master