summaryrefslogtreecommitdiff
path: root/doc/design/adjusted_branches.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-02-29 17:39:06 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-02-29 17:39:06 -0400
commit9aa4e41c77c68459b509ed28b4b638fcce9cf025 (patch)
treeb130f2fc6dc53cd56869687bb93800cad04a31be /doc/design/adjusted_branches.mdwn
parent0a0167491a436a8b62a0c12756f1f4173dfc226e (diff)
need to update master
Diffstat (limited to 'doc/design/adjusted_branches.mdwn')
-rw-r--r--doc/design/adjusted_branches.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn
index 854e4c0e7..f98bff00b 100644
--- a/doc/design/adjusted_branches.mdwn
+++ b/doc/design/adjusted_branches.mdwn
@@ -174,7 +174,7 @@ adjust that commit so it does not have adjusted/master as its parent.
|--------------->B''
| |
-Finally, update master to point to B''.
+Finally, update master, by reverse filtering B''. TODO
Notice how similar this is to the commit graph. So, "fast-forward"
merging the same B commit from origin/master will lead to an identical