search

patrickkettner / grunt-compile-handlebars

grunt plugin to compile static html from a handlebars plugin
MIT License
115 stars 29 forks source link

Option for global json #7

Closed goette closed 11 years ago

goette commented 11 years ago

Just a small addition, to be able to use global json files on top of globbed jsons. So you have the abilitly to define global values that appear in every template as well as template-specific values. Test is included..

patrickkettner commented 11 years ago

Thanks for the pull! Could you squish em into a single commit, before I review?

patrickkettner commented 11 years ago

Why the close?

goette commented 11 years ago

Sorry I made a mistake when I tried to suqash the commits, haven't done that before I'll make a fresh pull request..

patrickkettner commented 11 years ago

No problem, I just wanted to make sure I didn't offend you or something :]

goette commented 11 years ago

No worries. But this squasing thing sure is tricky, at least for me :)

patrickkettner commented 11 years ago

It can seem complicated, but the easiet way to do it, in my opinion is

 git rebase -i HEAD~(N)

Where (N) is the number of commits you want to combine into one. ( so if you wanted to combine the last two commits, it would be git rebase -i HEAD~2)That will open up whatever editor you have configured (most likely vim). Youll want to change the pick at the beginning of every line except for the very top one to an f., then a :w to save and end

good luck!