diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-05 19:46:44 +0100 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-09-10 10:59:39 +0000 |
| commit | 586aacfe5b6c5f9b0d18ffa3fd9fe00f6692fe83 (patch) | |
| tree | 45a1d26bbc4f330ec0d25ba1de198d1a4600d88d /morphlib/git.py | |
| parent | fb2e08f81d96741c05597208fdab196ec0c1b584 (diff) | |
| download | morph-586aacfe5b6c5f9b0d18ffa3fd9fe00f6692fe83.tar.gz | |
Rewrite 'merge' command
'merge' now traverses every system in the branch root (baserock:morphs)
and merges any chunk or stratum that was changed with 'morph edit'. It
also takes care of updating the refs in the target branch.
Diffstat (limited to 'morphlib/git.py')
| -rw-r--r-- | morphlib/git.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/morphlib/git.py b/morphlib/git.py index 70915770..0a4b01f4 100644 --- a/morphlib/git.py +++ b/morphlib/git.py @@ -150,7 +150,6 @@ def checkout_ref(runcmd, gitdir, ref): '''Checks out a specific ref/SHA1 in a git working tree.''' runcmd(['git', 'checkout', ref], cwd=gitdir) - def reset_workdir(runcmd, gitdir): '''Removes any differences between the current commit ''' '''and the status of the working directory''' |