dahn
3106dba28c
git-pr py3 compatible ( #6961 )
...
* py3 print statement
* python3
2022-12-13 15:45:13 +05:30
Remi Bergsma
52edbbb6cc
Show actual diff in commits after merge
2015-12-12 11:22:32 +01:00
Remi Bergsma
1e6df1b775
fixed hardcoded merge message location
...
This would be empty if run from another directory, resulting
in a merge message with only a 'signed-off by' line.
2015-08-24 16:16:16 +02:00
Remi Bergsma
9a24109f95
fix bug where the countdown would be on multiple lines
...
Example of problem:
ATTENTION: Merging pull request #731 from remibergsma/centos7-kvm into 'master' branch in 5 seconds. CTRL+c to abort..
-n 5
-n 4
-n 3
-n 2
-n 1
-n 0
Should be compatible with more environments if printf is used instead.
2015-08-24 16:00:48 +02:00
Remi Bergsma
fed5c2b06a
make it work with any Apache repository mirrored on GitHub
2015-08-24 16:00:30 +02:00
Remi Bergsma
23b9365996
Improve error/help message in case of missing git remote
2015-08-24 11:52:03 +02:00
Miguel Ferreira
9211202bab
Add git merge scripts
2015-08-19 17:22:45 +02:00
