Lines Matching +full:sync +full:- +full:branches

1 \input texinfo @c -*- texinfo -*-
2 @documentencoding UTF-8
21 git --help
28 git <command> --help
29 man git-<command>
38 @url{http://git-scm.com/, Git website}.
42 What follows now is a basic introduction to Git and some FFmpeg-specific
49 You can get Git from @url{http://git-scm.com/}
69 git clone gil@@ffmpeg.org:ffmpeg-web <target>
76 If you don't have write-access to the ffmpeg-web repository, you can
77 create patches after making a read-only ffmpeg-web clone:
80 git clone git://ffmpeg.org/ffmpeg-web <target>
88 git config --global core.autocrlf false
96 git pull (--rebase)
104 @command{--rebase} (see below) is recommended.
107 @section Rebasing your local branches
110 git pull --rebase
121 git add [-A] <filename/dirname>
122 git rm [-r] <filename/dirname>
161 git diff --check
172 For cosmetics-only commits you should get (almost) empty output from
175 git diff -w -b <filename(s)>
187 git add [-i|-p|-A] <filenames/dirnames>
193 git config --global user.name "My Name"
194 git config --global user.email my@@email.invalid
197 Use @option{--global} to set the global configuration for all your Git checkouts.
214 git config --global core.editor
228 the patch by @command{git format-patch}.
233 git format-patch <commit> [-o directory]
240 git format-patch origin/master
248 git format-patch -n
257 git send-email <commit list|directory>
260 will send the patches created by @command{git format-patch} or directly
263 Note that this tool must often be installed separately (e.g. @var{git-email}
264 package on Debian-based distros).
273 git add [-A] .
285 Add the following to your @file{~/.gitconfig} to help @command{git send-email}
286 and @command{git format-patch} detect renames:
295 In order to have @command{git send-email} automatically send patches
296 to the ffmpeg-devel mailing list, add the following stanza
301         to = ffmpeg-devel@@ffmpeg.org
316 git commit --amend
322 git rebase -i origin/master
329 @command{git reset}, @command{git commit --amend} and @command{git rebase}
330 rewrite history, so you should use them ONLY on your local or topic branches.
344 git push origin master --dry-run
348 (@var{origin}). And list which branches and ranges or commits would have been
351 out of sync. Refer to @ref{Updating the source tree to the latest revision}.
366 branches matching the local ones.
384 git checkout -b svn_23456 :/'as revision 23456'
390 git checkout -b svn_23456 $SHA1
396 @chapter Pre-push checklist
404 First, make sure that the commits and branches you are going to push
407 with @option{--dry-run} first. And then inspecting the commits listed with
408 @command{git log -p 1234567..987654}. The @command{git status} command
417 @item if fate fails due to missing samples run @command{make fate-rsync} and retry
429 merge request to ffmpeg-devel. You can also push them directly but this is not