-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Am Di den 27. Sep 2011 um 16:18 schrieb Klaus Ethgen: > Normally it is much more easy to merge the feature branch to master.
It yould look like: echo "f5470bbc26b15ce585c8f1cedfad3adfa611ef85 a8c5cb269996f35d4877e31514956c198c3bd2e5 a3a06975ec99beac1b2f1f16445679dd56fae053" >> .git/info/grafts gitk --all Just delete this line from grafts file to get the original state. Regards Klaus - -- Klaus Ethgen http://www.ethgen.ch/ pub 4096R/4E20AF1C 2011-05-16 Klaus Ethgen <kl...@ethgen.de> Fingerprint: 85D4 CA42 952C 949B 1753 62B3 79D0 B06F 4E20 AF1C -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQGcBAEBCgAGBQJOge/EAAoJEKZ8CrGAGfask/EMALgM1j+NTN57Rq82RFPOUd8/ nrWPWebmj+qaPXT2zyUAAe49F7x+G6Biy9FQvtrSqMvbYo4B9iCw7ggXtLB4kxVv CfELSVTHYg5b4JXkpPdnjin/q7ZToM3ll1pQYHb50nJT6RSZqZjhiHvjFbTNBOu8 6nSMFtkWgSC11BqkyPI1zIDebohNyShtItVW1eXNjAakCpm6/kKJOv1fj495GVTy a0BNjLPAr78HzMzrLOzSMrV3G/t5C4C09hYMZdvkamAN+ygcDZk/7h4tS88cJllR HJ5fyWKDzlVLob2xNxFT95l7zB5RbjW0jJ7RfJHao8vR3xEDLWUO0RhxIXP/hc5m 2zyyXcFiTLZAhsxRhDN5E8c/tWDb6Meqye1wJgYT/HyYoEuZsE0m3hefN2brRulc lGjjnNO2Fdb53/uULHDcleOXZgoOmav6kUzRSAnrbPGw+v64GM5+L6eR0s6rDLkK D7E62HV7ST07onsi+K3JXtwL17IHBuPDXzW+CY+VFQ== =Pm5v -----END PGP SIGNATURE----- ------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity and more. Splunk takes this data and makes sense of it. Business sense. IT sense. Common sense. http://p.sf.net/sfu/splunk-d2dcopy1 _______________________________________________ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel
