diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-12 12:58:02 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-12 12:58:02 -0400 |
| commit | 4f9fa2648b80d489779b0a97efac7652634cf16f (patch) | |
| tree | 3144c3561a89532fc68a555fa23b96e2af74e8de | |
| parent | ca10c06819aacc50d4423836ce51fc4486803789 (diff) | |
| parent | f6588609a5a908b65fee90566b2071b0c1dc645c (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/devblog/day_372__adjusted_branches_improved.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/devblog/day_372__adjusted_branches_improved.mdwn b/doc/devblog/day_372__adjusted_branches_improved.mdwn index ce91693f4..625169eaf 100644 --- a/doc/devblog/day_372__adjusted_branches_improved.mdwn +++ b/doc/devblog/day_372__adjusted_branches_improved.mdwn @@ -1,4 +1,4 @@ -After a real brain-bender of a day, I have commit propigation from the +After a real brain-bender of a day, I have commit propagation from the adjusted branch back to the original branch working, without needing to reverse adjust the whole tree. This is faster, but the really nice thing is that it makes individual adjustments simpler to write. |