[mythtv] Decision on FFmpeg repository
Peter Bennett
pb.mythtv at gmail.com
Fri May 18 15:10:21 UTC 2018
On 05/17/2018 09:11 PM, David Engel wrote:
> I wonder if --no-ff would help when merging ffmpeg's changes into our
> master branch. I know there are cases, like this maybe, where git
> puts a single, "merge" commit on the main branch. When that happens,
> I believe git requires extra log options to see all of the individual
> commits that were merged.
The git subtree commands do not have a --no-ff option. However if we do
use subtree, the relatively easy "git log -- mythtv" is probably a good
solution for seeing only the mythtv commits.
Peter
More information about the mythtv-dev
mailing list