diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-08-29 13:23:02 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-08-29 13:23:02 -0400 |
| commit | 4011e8374f0f5af201c8444894481407ddcd57a8 (patch) | |
| tree | 5a4182b42d13150a8d826633797a86c85391a54a /Annex | |
| parent | 69bfbd94004d193050e0fe0827f380bdd1ed5644 (diff) | |
| parent | c0a39909829a131e4216b2f6021430fcbdad30b4 (diff) | |
Merge branch 'master' into forget
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/TaggedPush.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/TaggedPush.hs b/Annex/TaggedPush.hs index 5dac345f2..44a1a0eb0 100644 --- a/Annex/TaggedPush.hs +++ b/Annex/TaggedPush.hs @@ -19,7 +19,7 @@ import Utility.Base64 - the UUID of the repo that will be pushing it, and possibly with other - information. - - - Pushing to branches on the remote that have out uuid in them is ugly, + - Pushing to branches on the remote that have our uuid in them is ugly, - but it reserves those branches for pushing by us, and so our pushes will - never conflict with other pushes. - |