[mutter: 209/209] Merge changes from Metacity

From: Owen Taylor <otaylor src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [mutter: 209/209] Merge changes from Metacity
Date: Thu, 11 Feb 2010 17:38:52 +0000 (UTC)

commit 7834bba6f7d3aa48a81a70b29c883029263e8e67
Merge: 857c8aa a8fc30a
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Thu Feb 11 12:15:23 2010 -0500

    Merge changes from Metacity
    
    Merge all relevant changes from Metacity as of Feb 10, 2010
    
    For future merger's reference, the best way to merge changes from
    Metacity is to add the Metacity git repository as a remote, then
    cherry-pick the desired changes - this will exploit the shared
    history of the two repositories when merging in the changes.
    
    Then when finished, use 'git merge -s ours <head commit of metacity>'
    to record the merge, and 'git commit --amend' to fix up the
    commit message.

---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]