other git tips

This is mostly for my own benefit, but here are some git commands that I've found useful: simplified git log showing 1-line description of commits: git log --pretty=oneline simplified git log showing tree structure of git repo: git log --graph --simplify-by-decoration --pretty=format:'%d' --all for more complicated logs, use gitk --all deleting a local branch (in case you muck around with a branch too much and can't seem to get things to reset properly with ): git branch -d the_local_branch when doing this, make sure you're on another branch (i.e., you're not on the…Read more …

learning about git rebase and git format-patch

After reading a lot about git merge and git rebase, my takeaway is this: Use git rebase when: Working alone on a feature branch that isn't and won't be shared with anyone. Rebasing will keep your history cleaner. You're done working on a feature branch and about to integrate it into the main branch. Use rebase to sanitize your history and squash/rewrite history as needed before the 'big merge' onto the main branch. Use git merge when: Working alone on a feature branch and others may be work off of your branch. This…Read more …

pulling github back to local machine

Now that I had a clean slate in terms of my dev setup, I needed to pull my github changes back to my local machine. Currently my .git/config looked like this: [remote "origin"] url = https://github.com/hyperkitty/hyperkitty.git fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master To pull my github changes (which I had forked from the main repo), I made these changes to .git/config: [remote "origin"] url = git@github.com:/hyperkitty.git fetch = +refs/heads/*:refs/remotes/origin/* [remote "upstream"] url = https://github.com/hyperkitty/hyperkitty.git fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master With these changes,…Read more …

installing chromium

Fedora comes with Firefox, but I also like developing on Chrome. And as a front-end developer, it's always good to do cross-browser tests. To install Chrome: wget http://repos.fedorapeople.org/repos/spot/chromium-stable/fedora-chromium-stable.repo sudo cp fedora-chromium-stable.repo /etc/yum.repos.d sudo yum -y install chromiumRead more …

starting from a clean slate

I'm getting back into Fedora stuff again (working on front-end dev & design for Hyperkitty). I originally submitted something for consideration back in October, but since it's been awhile, I thought I'd try to see how easy it would be to integrate my submission into the main repo via a pull request. Turns out it wasn't as easy as I had hoped. It was recommended that I do a rebase, but that ended up leading to lots of conflicts. Most likely because there had been other front-end commits before mine, which meant that…Read more …
← Newer Posts
Older Posts →