← Back to branch summary

~ubuntu-branches/debian/sid/git/sid

« back to all changes in this revision

Viewing changes to Documentation/merge-options.txt

  • Committer: Package Import Robot
  • Author(s): Jonathan Nieder
  • Date: 2013-06-12 07:50:53 UTC
  • mfrom: (1.2.19) (2.1.31 experimental)
  • Revision ID: package-import@ubuntu.com-20130612075053-uue9xe0dq0rvm44y
Tags: 1:1.8.3.1-1
* merge branch debian-experimental
* new upstream point release (see RelNotes/1.8.3.1.txt).
* debian/watch: use xz-compressed tarballs from kernel.org.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Documentation/merge-options.txt
30
30
 
31
31
--no-ff::
32
32
        Create a merge commit even when the merge resolves as a
33
 
        fast-forward.
 
33
        fast-forward.  This is the default behaviour when merging an
 
34
        annotated (and possibly signed) tag.
34
35
 
35
36
--ff-only::
36
37
        Refuse to merge and exit with a non-zero status unless the
83
84
        Pass merge strategy specific option through to the merge
84
85
        strategy.
85
86
 
 
87
--verify-signatures::
 
88
--no-verify-signatures::
 
89
        Verify that the commits being merged have good and trusted GPG signatures
 
90
        and abort the merge in case they do not.
 
91
 
86
92
--summary::
87
93
--no-summary::
88
94
        Synonyms to --stat and --no-stat; these are deprecated and will be