Closed goette closed 11 years ago
Thanks for the pull! Could you squish em into a single commit, before I review?
Why the close?
Sorry I made a mistake when I tried to suqash the commits, haven't done that before I'll make a fresh pull request..
No problem, I just wanted to make sure I didn't offend you or something :]
No worries. But this squasing thing sure is tricky, at least for me :)
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!
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..