git rebasing municipal

git-rebase.log

peter@Selene:~/mesa-municipal(master)$ git pull
remote: Counting objects: 7, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 7 (delta 0), reused 0 (delta 0), pack-reused 1
Unpacking objects: 100% (7/7), done.
From github.com:CityOfMesaAZ/Municipal
   1d0be4e..53f4d71  master     -> origin/master
 * [new branch]      master_bu_03-05-15 -> origin/master_bu_03-05-15
 * [new branch]      mesa-customized_bu_03-05-15 -> origin/mesa-customized_bu_03-05-15
Updating 1d0be4e..53f4d71
Fast-forward
 lib/tasks/legistar_matters.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

peter@Selene:~/mesa-municipal(master)$ git log
commit 53f4d71a20d3b447d52ffe2b3fd3a0ab368d80ac
Merge: 1d0be4e c9e4591
Author: vancefsmithmesa <vance.smith@mesaaz.gov>
Date:   Thu Mar 5 09:28:56 2015 -0700

    Merge pull request #10 from codeforamerica/master
    
    Merging Legistar attachments bug fixes.

commit c9e45918530fa89a2444d75109c88f6998d11462
Merge: 1d0be4e 955a1ed
Author: Peter W <the.peter.w@gmail.com>
Date:   Wed Mar 4 08:38:12 2015 +1100

    Merge pull request #151 from codeforamerica/fixes/150-missing-attachments
    
    Limit matters dynamically rather than via hard coded dates

commit 955a1edb340cbbdd24b9bf8daa6271c4a46bb496
Author: Peter W <techieshark@gmail.com>
Date:   Fri Feb 27 07:26:44 2015 +1100

    Limit matters to those soon/recently
    
    - the prev code used a hard code fixed date, which became stale
    - this calculates date dynamically

...

peter@Selene:~/mesa-municipal(master)$ git checkout mesa-customized
Switched to branch 'mesa-customized'
Your branch is up-to-date with 'origin/mesa-customized'.

peter@Selene:~/mesa-municipal(mesa-customized)$ git checkout -b mesa-customized-backup
fatal: A branch named 'mesa-customized-backup' already exists.

peter@Selene:~/mesa-municipal(mesa-customized)$ git checkout -b mesa-customized-backup2
Switched to a new branch 'mesa-customized-backup2'

peter@Selene:~/mesa-municipal(mesa-customized-backup2)$ git checkout mesa-customized
Switched to branch 'mesa-customized'
Your branch is up-to-date with 'origin/mesa-customized'.

peter@Selene:~/mesa-municipal(mesa-customized)$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: Reverted to regular logo
Applying: Put municipal@mesaaz.gov as the hello email
Applying: Update _footer.html.erb

peter@Selene:~/mesa-municipal(mesa-customized)$ git branch -D mesa-customized-backup2
Deleted branch mesa-customized-backup2 (was 4cd907d).