Working with zip files

2016-08-16 Thread Nikolaus Rath
Hello, I would like to store Simulink models in a Git repository. Unfortunately, the file format is binary. But luckily, the binary format happens to be a zipfile containing nicely formatted XML files. Is there a way to teach Git to take advantage of this when storing, diff-ing and merging these

Re: Working with zip files

2016-08-16 Thread Nikolaus Rath
On Aug 16 2016, David Lang wrote: > On Tue, 16 Aug 2016, Nikolaus Rath wrote: > >> I would like to store Simulink models in a Git >> repository. Unfortunately, the file format is binary. But luckily, the >> binary format happens to be a zipfile containing nicely formatte

Re: Working with zip files

2016-08-16 Thread Nikolaus Rath
On Aug 16 2016, David Lang wrote: > On Tue, 16 Aug 2016, Nikolaus Rath wrote: > >> I would like to store Simulink models in a Git >> repository. Unfortunately, the file format is binary. But luckily, the >> binary format happens to be a zipfile containing nicely formatte

Most recent revision that contains a string

2016-08-20 Thread Nikolaus Rath
Hello, What's the easiest way to find the most recent revision (of any file in the repository, including those that have been deleted in the current HEAD) that contains a given string? I was hoping that "git grep" would do this (like in Mercurial), but as far as I can tell it only greps through t

Re: Most recent revision that contains a string

2016-08-22 Thread Nikolaus Rath
On Aug 21 2016, Eric Wong wrote: > Nikolaus Rath wrote: >> What's the easiest way to find the most recent revision (of any file in >> the repository, including those that have been deleted in the current >> HEAD) that contains a given string? > > I normally do s

Advanced revision selection?

2016-05-27 Thread Nikolaus Rath
Hello, Is there a way to specify revision ranges that has more power than what's described in gitrevisions(7)? For example, is there a way to show "the three most recent commits preceding a tag that starts with "release-" that are also descendants of commit aebecf."? In Mercurial, this can be do

How to find commits unique to a branch

2016-06-20 Thread Nikolaus Rath
Hello, What's the best way to find all commits in a branch A that have not been cherry-picked from (or to) another branch B? I think I could format-patch all commits in every branch into separate files, hash the Author and Date of each files, and then compare the two lists. But I'm hoping there's

Re: How to find commits unique to a branch

2016-06-20 Thread Nikolaus Rath
On Jun 20 2016, Junio C Hamano wrote: > Nikolaus Rath writes: > >> What's the best way to find all commits in a branch A that have not been >> cherry-picked from (or to) another branch B? >> >> I think I could format-patch all commits in every branch into sep

Re: How to find commits unique to a branch

2016-06-21 Thread Nikolaus Rath
On Jun 20 2016, Nikolaus Rath wrote: > On Jun 20 2016, Junio C Hamano wrote: >> Nikolaus Rath writes: >> >>> What's the best way to find all commits in a branch A that have not been >>> cherry-picked from (or to) another branch B? >>> >>>

Re: How to find commits unique to a branch

2016-06-22 Thread Nikolaus Rath
On Jun 21 2016, Michael J Gruber wrote: > Nikolaus Rath venit, vidit, dixit 21.06.2016 01:21: >> On Jun 20 2016, Junio C Hamano wrote: >>> Nikolaus Rath writes: >>> >>>> What's the best way to find all commits in a branch A that have not been >

Re: How to find commits unique to a branch

2016-06-22 Thread Nikolaus Rath
On Jun 21 2016, Junio C Hamano wrote: > Nikolaus Rath writes: > >> On Jun 20 2016, Nikolaus Rath wrote: >>> On Jun 20 2016, Junio C Hamano wrote: >>>> Nikolaus Rath writes: >>>> >>>>> What's the best way to find all commits