mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

need to update master

Browse source
This commit is contained in:
Joey Hess 2016-02-29 17:39:06 -04:00
parent a97a9aaaee
commit 102229fc67
Failed to extract signature
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/design/adjusted_branches.mdwn
View file

@ -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