From 102229fc67ae03ff3840a5d0bcba2d28494d1956 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 29 Feb 2016 17:39:06 -0400 Subject: [PATCH] need to update master --- doc/design/adjusted_branches.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn index 854e4c0e7c..f98bff00b2 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