We're trying to do a match on top.sls. I wrote a git hook a few years ago for these guys, I forgot which... pre-commit maybe.. while read old new something; do git diff --quiet $old $new -- top.sls || exit 1; done .. It's something similar to that anyway.

Hey all, I'm currently working on project with a git sub project. Its a foreign repository I have von github. Now I have this directory inside my repository. And I changed a bit inside the code of the foreign repository

I added a personal file with an important change (in a different file) to a single commit. is it possible to delete that single file while keeping the changes on the other? trying to interactive rebase but i can't just squash w/ previous and untrack that file simultaneously

yeah they'll have to reset everything. i'm just trying to keep my history clean. i wasnt the one who made the mistake but i'm the one whos able to fix it. i have to tell them to create branches for their changes to avoid this kind of stuff i think?

my approach is to understand git to the point that I can infer their mistakes, explain it to them and give them instructions on how to clean it up themselves (and force them to follow that in case they want their contribution reviewed and merged)

timwis: the two common approaches are to git rebase -i to a point before that, chose edit for the commit you want to change and proceed with the instructions, or to git commit --fixup=HEAD~3 and git rebase -i --autosquash (again to a point before)

Hi. I'm getting setup to use a git server as a central staging repository for my webdev. It'll be the usual dev->stage->prod workflow. When I pull from the central repo to 'prod' what's the right way to only pull the current/latest state? I.e., I don't want all the git repo history ending up on the production machine.

RobsBoat: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html

Hi guys, I'm currently building up a workflow for me to deploy websites for clients and so on... on the live server I have a folder /var/www/domain.tld/. Now I made a repository for that in /var/repos/domain.tld.git/. So I can use the post-receive file in the /hooks/ to push to the live server whenever I push to that repo. Now I have a website already in that /var/www/domain.tld/. So I wanted to pull everything to my local machine usi

For one, it looks a good idea because then someone can run the app by just cloning the repo, no need to build. But then, anytime the build changes, the whole file is different... so I guess that bloats the repo?