diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-09 02:58:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-09 02:59:49 +0100 |
| commit | 4354788a893d3633cb9f94932b4c075377a4b324 (patch) | |
| tree | b72774c0284514532dcebd447fc637cb5e573a60 /doc | |
| parent | 0827222b9cecc3bb07b07059716b81f644db9dcc (diff) | |
| parent | f38f3b88a5a74d0573dc299a512a87f6d579323b (diff) | |
| download | ffmpeg-4354788a893d3633cb9f94932b4c075377a4b324.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
tls: Use ERR_get_error() in do_tls_poll
indeo3: Fix a fencepost error.
mxfdec: Fix comparison of unsigned expression < 0.
mpegts: set stream id on just created stream, not an unrelated variable
ra288: return error if input buffer is too small
ra288: utilize DSPContext.vector_fmul()
ra288: use memcpy() to copy decoded samples to output
mace: only calculate output buffer size once
Remove redundant filename self-references inside files.
indeo3data: add missing config.h #include for HAVE_BIGENDIAN
x86: drop pointless ARCH_X86 #ifdef from files in x86 subdirectory
avplay: reset rdft when closing stream.
doc/git-howto: expand format-patch and send-email notes.
lavf: expand doxy for some AVFormatContext fields.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/git-howto.txt | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/doc/git-howto.txt b/doc/git-howto.txt index 72cde72eed..06aee44501 100644 --- a/doc/git-howto.txt +++ b/doc/git-howto.txt @@ -205,8 +205,19 @@ I. BASICS: git format-patch <commit> [-o directory] - will generate a set of patches out of the current branch starting from - commit. By default the patches are created in the current directory. + will generate a set of patches for each commit between <commit> and + current HEAD. E.g. + + git format-patch origin/master + + will generate patches for all commits on current branch which are not + present in upstream. + A useful shortcut is also + + git format-patch -n + + which will generate patches from last n commits. + By default the patches are created in the current directory. 11. Sending patches for review @@ -215,6 +226,8 @@ I. BASICS: 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. + Note that this tool must often be installed separately (e.g. git-email + package on Debian-based distros). 12. Pushing changes to remote trees |