summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
268663d)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
our $us = qw(git-debrebase);
our $us = qw(git-debrebase);
-our $wrecknoteprefix = 'refs/debrebase-wreckage';
+our $wrecknoteprefix = 'refs/debrebase/wreckage';
export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
wreckage-before () {
export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
wreckage-before () {
- junkref=refs/debrebase-wreckage/junk
+ junkref=refs/debrebase/wreckage/junk
git update-ref $junkref v2.1
}
wreckage-after () {
test '' = "$(t-git-get-ref-exact $junkref)"
git update-ref $junkref v2.1
}
wreckage-after () {
test '' = "$(t-git-get-ref-exact $junkref)"
- git for-each-ref refs/debrebase-wreckage | egrep .
+ git for-each-ref refs/debrebase/wreckage | egrep .
}
: ----- prepare the baseline -----
}
: ----- prepare the baseline -----
-if git for-each-ref refs/debrebase-wreckage | egrep .; then fail wreck; fi
+if git for-each-ref refs/debrebase/wreckage | egrep .; then fail wreck; fi
: ----- make the merge -----
: ----- make the merge -----
: ----- resolve the conflict -----
# omg
: ----- resolve the conflict -----
# omg
-git checkout debrebase-wreckage/merged-patchqueue
+git checkout debrebase/wreckage/merged-patchqueue
QUILT_PATCHES=debian/patches quilt push -a
QUILT_PATCHES=debian/patches quilt refresh
git add debian/patches
QUILT_PATCHES=debian/patches quilt push -a
QUILT_PATCHES=debian/patches quilt refresh
git add debian/patches