summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
8c4cbc9)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
" $q->{SeriesTip}]"
];
printdebug "merge_series pec $pec ";
" $q->{SeriesTip}]"
];
printdebug "merge_series pec $pec ";
- runcmd @git, qw(rm -q --cached), $seriesfile;
+ runcmd @git, qw(rm -q --ignore-unmatch --cached), $seriesfile;
$pec = make_commit [ $pec ], [
"Drop series file from $s to avoid merge trouble",
"[git-debrebase merge-innards patch-queue prep:".
$pec = make_commit [ $pec ], [
"Drop series file from $s to avoid merge trouble",
"[git-debrebase merge-innards patch-queue prep:".