Compare commits

..

No commits in common. "2dab39a35cc2ecc10ea33fbf88f5ca54f5879f8f" and "a1238f044ae287051565511500480493eefb139c" have entirely different histories.

4 changed files with 4 additions and 4 deletions

View File

@ -1,3 +1,3 @@
## Release 0.3.2p74 du 28/02/2025-20:28
## Release 0.3.1p74 du 28/02/2025-20:21
(tech) Migration vers pman

View File

@ -1 +1 @@
0.3.2
0.3.1

View File

@ -71,7 +71,7 @@ $1 == "|" {
function _list_commits() {
local source="${1:-$SrcBranch}" dest="${2:-$DestBranch}" mergebase
setx mergebase=git merge-base "$dest" "$source"
git log --oneline --graph --no-decorate "$mergebase..$source" |
git log --oneline --graph "$mergebase..$source" |
grep -vF '|\' | grep -vF '|/' | sed -r 's/^(\| )+\* +/| /; s/^\* +/+ /' |
_filter_rel
}

View File

@ -83,7 +83,7 @@ EOF
elif ! "$script" merge ${Delete:+delete} ${Push:+push}; then
eimportant "Veuillez consulter le script $script pour le détail des opérations qui n'ont pas pu êtres effectuées"
die
elif [ -n "$Deleted" -a -n "$Pushed" ]; then
elif [ -n "$Deleted" -n "$Pushed" ]; then
[ -n "$_KeepScript" ] || rm "$script"
else
local cmd