git ready » ribbon/catchup: reading new commits
I picked up this trick to use Git as a kind of feed-reader on Moro’s blog, so I thought I’d share it here: Let’s say you want to stay up-to-date with a project – for example, an upstream repository you are contributing to, a smart developer you are trying to learn from, or an awesome library you’d just like to watch. How do you go about following the commits that are being pushed? You could use RS
Keep either file in merge conflicts
Sometimes when resolving a merge conflict, you may want to keep one file instead of the other. You don’t need to open up the files and fix potentially hundreds of conflicts; you just want to choose the one you want and be done with it. Unfortunately, this wasn’t exactly straightforward in older versions of Git, but more recent versions have made it easier. Big thanks to Kevin Old for his post on t
Temporarily ignoring files
Ignoring files with Git is typically straightforward. However, there are times when you may need to temporarily hide changes in a file, such as during a development session. Thanks to some inventive manual tinkering by Eelco Wiersma, there’s a simple workaround for this. His primary issue stemmed from using git commit -a, which automatically adds modified files to the commit object. While convenie
Squashing commits with rebase
The git rebase command offers powerful options in its --interactive mode, commonly abbreviated as -i. One of the most popular features is the ability to squash commits, which merges smaller commits into larger ones. This can be useful when organizing your changes or preparing to finalize your work. Let’s explore how to do this effortlessly. Before we begin, a word of caution: Only squash commits t
git ready - restoring lost commits
So, you just executed git reset --hard HEAD^ and discarded your last commit. But now you realize you really needed those changes. Don’t panic—Git likely still has your commit. When you reset, the discarded commit enters a “dangling” state, remaining in Git’s datastore until garbage collection runs. As long as you haven’t run git gc since the reset, you should be able to recover your lost commit. S
Intro to rebase
Git’s rebase command can be puzzling for newcomers, and its description in the manpage doesn’t offer much clarity: git-rebase – Forward-port local commits to the updated upstream head Not exactly beginner-friendly, right? Thankfully, Travis Swicegood provides a more relatable metaphor: Imagine a cleaver. Rebase acts like this cleaver, slicing and dicing commits however you see fit and placing them
git ready » text-based graph
Just a short and interesting tip today about git log --graph. If you’re confused about where branches are headed or how merges worked, and you’re either too lazy to fire up gitk, gitx, or the GitHub Network Graph, you can get a really simple and fast graphical representation of your commits with this command. Doing a git log --graph produces this for my clone of the jekyll repo, which has changes
git ready » branching and merging
Branching in git is easier than you’d think. It’s fast (40 characters written to a file), simple (one command to create a branch), and efficient (it doesn’t create a whole copy of your current working state). The branches you create don’t have to exist in the remote repository, so you can use them to test out new features or bug fixes without breaking what’s already working. Perhaps Why Git is Bet
git ready » bend logs to your will
git log is an extremely powerful command with plenty of options that are helpful for figuring out what work has been done on your repositories and just who’s done it. This post enumerates a few of the more useful options. Most of these tips were farmed from Scott Chacon’s gitcast on git log and R. Tyler Ballance’s git protip series. git log -<n> Show the log for n number of commits. For example, g
1
リリース、障害情報などのサービスのお知らせ
最新の人気エントリーの配信
j次のブックマーク
k前のブックマーク
lあとで読む
eコメント一覧を開く
oページを開く
Reflog, your safety net
git ready » sharing your changes
git ready » count your commits
git ready » pushing and pulling
Home
git ready » fixing broken commit messages