<pman>Intégration de la branche dev74
This commit is contained in:
commit
0c473384f2
@ -1,3 +1,3 @@
|
||||
## Release 0.3.1p74 du 28/02/2025-20:21
|
||||
## Release 0.3.2p74 du 28/02/2025-20:28
|
||||
|
||||
(tech) Migration vers pman
|
||||
|
@ -1 +1 @@
|
||||
0.3.1
|
||||
0.3.2
|
||||
|
@ -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 "$mergebase..$source" |
|
||||
git log --oneline --graph --no-decorate "$mergebase..$source" |
|
||||
grep -vF '|\' | grep -vF '|/' | sed -r 's/^(\| )+\* +/| /; s/^\* +/+ /' |
|
||||
_filter_rel
|
||||
}
|
||||
|
2
bin/pdev
2
bin/pdev
@ -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" -n "$Pushed" ]; then
|
||||
elif [ -n "$Deleted" -a -n "$Pushed" ]; then
|
||||
[ -n "$_KeepScript" ] || rm "$script"
|
||||
else
|
||||
local cmd
|
||||
|
Loading…
Reference in New Issue
Block a user