git-log

I'm learning about relative commit references and trying to understand the following git log --oneline --graph output provided in a lesson. In the lesson it says that given HEAD points to the 9ec05ca commit, HEAD^^^ (meaning the great-grandparent commit) is the 0c5975a commit. But it seems to me 4c9749e should be the great grandparent, if each SHA is a direct descendant of the one below it. Any clarification appreciated. Commit can have more than one parent. ^ 1 means first parent. ^2 means second parent and do on. Just ^ defaults to ^1 which is first parent. Similarly ~ give access to

I set *.py diff=python in .git/info/attributes . So Git knows where function boundaries. git diff -W can even make sure the whole function is shown. But is there a way to limit the output of a git diff to just a particular function (or more than one)? (Failing that, I guess it's awk...) EDIT This would also be useful for git log and git rev-list : don't show me every commit that modifies views.py, show me commits that modify a certain function in it. (Yes, in an ideal world, views.py wouldn't be a 2000 line behemoth frequently modified by 8 different developers...) Steve Bennett Ok, thanks to

I need to write a script that incrementally keeps track of files and directories added and removed from a git repo. I have tried to use: git log -n1 --pretty="format:" --name-only But that only tells me which files were committed. It does not specify if it was added or removed. Any ideas? The option you're looking for is --name-status . Like --name-only it's actually a git-diff option; git-log accepts those to determine how it'll display patches. git log -n 1 --pretty=oneline --name-status Or equivalently (minus the log header): git diff --name-status HEAD^ HEAD As isbadawi points out, you can

Lets use the latest available git 2.16.2 and tig 2.3.3. cd /tmp && mkdir fit && cd fit git init touch m1 && git add m1 && git commit -m "master 1" touch m2 && git add m2 && git commit -m "master 2" git checkout -b develop touch d1 && git add d1 && git commit -m "develop 1" git checkout master touch m3 && git add m3 && git commit -m "master 3" git checkout develop git merge master --no-edit touch d2 && git add d2 && git commit -m "develop 2" touch d3 && git add d3 && git commit -m "develop 3" git checkout master git merge develop --no-edit touch m4 && git add m4 && git commit -m "master 4" git

I'm curious what's the best practice of keeping your occasional contributions to an OSS project in git (e.g., on github/bitbucket/gitlab), whilst the upstream is exclusively CVS. My take is that it's very convenient to simply commit CVS/{Entries,Repository,Root} directly into git , and then at any time and from any box, you can simply checkout your git repo (w/ git ), and then update from the real upstream with cvs up , which is exactly what I do with my OpenBSD ports-readmes fork , as well as mdocml . However, I've noticed that most people are quite surprised and puzzled to see these CVS

Given the history X-Y <- feature / A-B-C-D-E <- master I want to get the descendants of a given commit. One solution seems to be: git log --all --ancestry-path <ref>^! However, the behaviour is a bit strange: when <rev> is C , the result is CDEXY when <rev> is D or X , the result is DEXY (weird!) when <rev> is E , the result is E My understanding is that the command does not get all children of <rev> ; instead, it gets all children of parent-of(ref). Am I right? This is unintuitive, error prone, and, quite frankly, irritating. How command should I run instead, in order to limit the log to the