[Solved] Real quick gitweb question

Ranguvar · 2009-02-19 03:32:39

Hey, I think this would go here and not in Programming, because it's just a simple Gitweb thing.

I've been looking through Gitweb pages a lot lately, and I've not been able to figure out 'merge' commits. I don't have the time to learn Git right now (though I plan to later), but I'd like to be able to see what the actual changes are when a branch is merged (I don't mean conceptually, I mean seeing the actual diffs that are applied when the branch is merged).

For example: http://git.zen-sources.org/?p=zen.git;a … 994eb39be9
I think it's to do with the 'parent' commits - how do I see the individual file diffs?

Thanks very much!

Last edited by Ranguvar (2009-02-22 22:48:09)

bwalk · 2009-02-20 16:55:49

It just applied all commits in one branch to another branch without doing anything real. This is counterintuitive and hard to follow, rebasing would be the better way to go. Then the history stays linear and no merge commit is created. You can think of a merge commit as some meta commit where two HEADs just get merged.

Ranguvar · 2009-02-21 19:23:05

Okay, thanks. But how do I see the actual diffs that happened with this merge?

bwalk · 2009-02-22 10:38:32

Probably I don't understand neither git nor your question right, but in this commit, nothing happend. It just took all changes from branch reiser4 and applied them to the master branch. There could be a merge before that, so the actual changes would be the diff between the last merge and reiser4 HEAD + chenges from master from last merge to HEAD.

That's how I understood git. THis is somehow reflected when you click on 'commitdiff' in your example. Since the merge had no conflicts, there are no changes introduced with this commit.

If you have the time, look into git. It is quite nicely designed and very well documented. Though a bit strange at the beginning, it make perfect sense when you learned a lot about it. If you know a correct answer to your problem, mind posting it here, I want to know, how wrong I actually am

Allan · 2009-02-22 10:54:16

I'm really not sure you can see what changes were on a branch easily on gitweb. It checkout the repo and use gitk to visualise the branches and figure out what has gone on.

Ranguvar · 2009-02-22 22:47:52

Alright, thanks all

Arch Linux

#1 2009-02-19 03:32:39

[Solved] Real quick gitweb question

#2 2009-02-20 16:55:49

Re: [Solved] Real quick gitweb question

#3 2009-02-21 19:23:05

Re: [Solved] Real quick gitweb question

#4 2009-02-22 10:38:32

Re: [Solved] Real quick gitweb question

#5 2009-02-22 10:54:16

Re: [Solved] Real quick gitweb question

#6 2009-02-22 22:47:52

Re: [Solved] Real quick gitweb question

Board footer