summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
64d159f)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
We want a --overwrite=VERSION option which 1. adjusts
the version used above, and 2. does the same thing in any
We want a --overwrite=VERSION option which 1. adjusts
the version used above, and 2. does the same thing in any
- quilt mode. If no split brain it should make the psuedomerge
+ quilt mode. If no split brain it should make the pseudomerge
# Finally: we do not necessarily reify the public view (as
# described above). This is so that we do not end up stacking two
# pseudo-merges. So what we actually do is figure out the inputs
# Finally: we do not necessarily reify the public view (as
# described above). This is so that we do not end up stacking two
# pseudo-merges. So what we actually do is figure out the inputs
- # to any public view psuedo-merge and put them in @mergeinputs.
+ # to any public view pseudo-merge and put them in @mergeinputs.
my @mergeinputs;
# $mergeinputs[]{Commit}
my @mergeinputs;
# $mergeinputs[]{Commit}
Uploads not made by dgit are represented in git by commits which are
synthesised by dgit. The tree of each such commit corresponds to the
unpacked source; there is an origin commit with the contents, and a
Uploads not made by dgit are represented in git by commits which are
synthesised by dgit. The tree of each such commit corresponds to the
unpacked source; there is an origin commit with the contents, and a
-psuedo-merge from last known upload - that is, from the contents of
+pseudo-merge from last known upload - that is, from the contents of
the dgit/suite branch.
dgit expects repos that it works with to have a
the dgit/suite branch.
dgit expects repos that it works with to have a
git add debian/pointless-for-dgit-test
git commit -m 'Pointless 2'
git add debian/pointless-for-dgit-test
git commit -m 'Pointless 2'
-t-commit 'Check psuedomerge' 1.0-3
+t-commit 'Check pseudomerge' 1.0-3
t-dgit --quilt=gbp --clean=git build-source
t-dgit --quilt=gbp --clean=git build-source