No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git merge $git_pseuomerge_opts "$@"
}
git merge $git_pseuomerge_opts "$@"
}
+t-gbp-example-prep-no-ff () {
t-tstunt-parsechangelog
t-archive example 1.0-1
t-git-none
t-tstunt-parsechangelog
t-archive example 1.0-1
t-git-none
t-gbp-unapplied-pq2qc
t-commit 'some updates' 1.0-2
t-gbp-unapplied-pq2qc
t-commit 'some updates' 1.0-2
+}
+
+t-gbp-example-prep () {
+ t-gbp-example-prep-no-ff
t-git-pseudo-merge \
-m 'Pseudo-merge to make descendant of archive' \
t-git-pseudo-merge \
-m 'Pseudo-merge to make descendant of archive' \