On Fri, 16 May 2014 17:21:10 +0800 lei yang <yanglei.f...@gmail.com> wrote:
> #cat recipes-devtools/python/python-heat_git.bb.rej > diff > a/meta-openstack/recipes-devtools/python/python-heat_git.bbb/meta-openstack/recipes-devtools/python/ > python-heat_git.bb (rejected hunks) @@ -10,6 +10,9 @@ SRCNAME = > "heat" SRC_URI = > "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ > file://heat.conf \ file://heat.init \ > + file://autoscaling_example.template \ > + file://one_vm_example.template \ > + file://two_vms_example.template \ > " > > SRCREV="ff6901141fbbc0a13604491aaba01a60487d6f6d" It's just a patch file in the so-called unified diff format [1]. To apply it, use the `patch` program. If you need to apply it to the work tree of a Git repository, use `git apply` (`git am` might also work). 1. http://en.wikipedia.org/wiki/Diff#Unified_format -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.