[FFmpeg-devel] [GIT] ready by the weekend
Wed Dec 1 20:08:56 CET 2010
On 12/1/10 3:44 PM, compn wrote:
> On Wed, 01 Dec 2010 10:21:29 +0100, Luca Barbato wrote:
>> 9. Reverting broken commits
>> git revert
>> git revert will generate a revert commit. This will not make the faulty
>> commit disappear from the history.
> git revert<commit> ?
>> git reset<commit>
>> git reset will uncommit the changes till<commit> rewriting the current
>> branch history.
> does it matter if we do this on our local branches or is this optional?
> will it affect push later on?
>> git commit --amend
>> allows to amend the last commit details quickly.
>> git rebase -i origin/master
>> will replay local commits over the main repository allowing to edit,
>> merge or remove some of them in the process.
>> Note that the reset, commit --amend and rebase rewrite history, so they
>> should only be used on commits that haven't been published yet!
> wow this looks confusing. what does that mean "haven't been published
> yet"? do you mean git push? if so, write that, i dont see 'git
> publish' so its confusing to use different terminology. also put quotes
> around "commit --amend".
Right, some more clarity is needed.
>> 11. Sending patches for review
>> git send-email<commit list|directory>
>> will send the patches created by git format-patch or directly generates
>> them. All the email fields can be configured in the global/local
>> configuration or overridden by command line.
> example config/command lines for adding ffmpeg-devel at mplayerhq.hu to
> the git send-email would be nice.
>> 12. Pushing changes to remote trees
>> git push
>> Will push the changes to the default remote (origin).
>> Git will prevent you from pushing changes if the local and remote trees are
>> out of sync. Refer to 2 and 2.a to sync the local tree.
> so git commit is just where you track changes locally, git push is
> where you push those commits to trunk?
trunk doesn't exist. The default remote exists. Should I assume _no_
knowledge at all when writing this?
>> git remote add<name> <url>
>> Will add additional remote with a name reference, it is useful if you want
>> to push your local branch for review on a remote host.
>> git push<remote> <refspec>
>> Will push the changes to the remote repository. Omitting refspec makes git
>> push update all the remote branches matching the local ones.
> are ffmpeg devels supposed to do this to any other trees? if yes we
> need list of trees, if not probably remove this part.
A list could be written once we start using git, before is a bit hard =P
>> Contact the project admins<root at mplayerhq dot hu> if you have technical
>> problems with the GIT server.
> isnt vlc hosting git atm? if so change mail addy.
More information about the ffmpeg-devel