~lbrulet-8/compiz-plugins-main/fix-876591

« back to all changes in this revision

Viewing changes to mag/.git/hooks/pre-rebase.sample

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2011-03-22 21:47:11 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110322214711-26jsq07o1lr0r0yd
Tags: 0.9.4git20110322-0ubuntu1
* New upstream bugfix snapshot
* debian/control:
  - bump dep for latest ABI break

Show diffs side-by-side

added added

removed removed

Lines of Context:
90
90
 
91
91
exit 0
92
92
 
93
 
<<\DOC_END
94
93
################################################################
95
94
 
96
95
This sample hook safeguards topic branches that have been
168
167
        git rev-list master..topic
169
168
 
170
169
        if this is empty, it is fully merged to "master".
171
 
 
172
 
DOC_END