On Wed, Aug 22, 2012 at 09:25:06PM +0200, Maaartin-1 wrote: > Quite often I need to see some changes in more detail and others only > briefly, so I get some idea about the context. For example I'd like > something like merging the outputs of > > git log -p -S Bandersnatch > and > git log --name-status --oneline > > together, so I know better what happened. > > A simpler (and maybe more important) example is merging > > git log -p some/dir > and > git log --name-status > > so I could see all the changes, and the chosen ones with all details. No, I don't think this is possible. We have "--full-diff", which disconnects the path-limiting from the diff generation, so that: git log --full-diff --name-status some/dir would choose only commits for some/dir, but show the full diff of each commit. However, what you are asking is to disconnect the two diff options: one verbose option only for interesting parts of the diff, and then a more sparse option for the rest. I'm pretty sure the diff machinery does not currently understand such an option. It would not be impossible to implement, I think, but I suspect it would involve refactoring the format selection in the diff code quite a bit. In the meantime, one thing you can do is generate the full diff output and then post-process it to collapse the uninteresting bits. I haven't tried, but you can probably do something like this using "folds" in your editor (e.g., shrink all of the diff content for a file to a single line, but then expand it on demand). -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html