> On Dec 8, 2014, at 11:33 AM, Geert Janssens <geert.gnuc...@kobaltwit.be> > wrote: > > John, > > How do you explain this push ? It's a push to master yet with several commits > from maint. I > don't see a merge happen from maint to master though ? Did you cherry-pick > them ? >
Geert, No, I merged, but it did a fast-forward, and I guess I wasn’t paying close enough attention to recognize the fast forward and that it didn’t ask me for a commit message for the merge commit. It’s a bit surprising to me that it was able to do a fast-forward merge from maint considering how different they are now. $ Manjusri:ter-git/src/gnucash-git> git branch -t maint origin/maint Branch maint set up to track remote branch maint from origin. $ Manjusri:ter-git/src/gnucash-git> git merge maint Auto-merging src/test-core/Makefile.am Auto-merging src/report/stylesheets/Makefile.am Auto-merging src/engine/Makefile.am Merge made by the 'recursive' strategy. .gitattributes | 3 +- Makefile.am | 1 + po/de.po | 1955 ++++++++++++----------------- src/app-utils/Makefile.am | 13 +- src/app-utils/business-prefs.scm | 2 +- src/business/business-gnome/Makefile.am | 16 +- src/core-utils/Makefile.am | 3 +- src/engine/Makefile.am | 9 +- src/gnc-module/Makefile.am | 2 +- src/gnome-utils/Makefile.am | 11 +- src/import-export/qif-imp/Makefile.am | 18 +- src/report/business-reports/Makefile.am | 12 +- src/report/locale-specific/us/Makefile.am | 14 +- src/report/report-gnome/Makefile.am | 8 +- src/report/report-system/Makefile.am | 15 +- src/report/report-system/html-jqplot.scm | 4 +- src/report/standard-reports/Makefile.am | 17 +- src/report/stylesheets/Makefile.am | 10 +- src/report/utility-reports/Makefile.am | 8 +- src/scm/Makefile.am | 3 +- src/scm/gnumeric/Makefile.am | 3 +- src/tax/us/Makefile.am | 5 +- src/tax/us/de_DE.scm | 11 +- src/tax/us/txf-de_DE.scm | 2 +- src/test-core/Makefile.am | 2 +- 25 files changed, 976 insertions(+), 1171 deletions(-) $ Manjusri:ter-git/src/gnucash-git> Regards, John Ralls _______________________________________________ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
