Jan Lindemann 4431993665 pgit.sh pull: Rebase target branch before merge ... Before merging the remote branch, do a rebase. This may fail and prompt conflict resolution, but that seems the canonical outcome for the common use case "interactive make git pull-xxx" with master out-of-sync. Signed-off-by: Jan Lindemann <jan@janware.com>		2026-01-31 11:13:41 +01:00
..
create-mkdebian.sh	create-mkdebian.sh: Re-add create-mkdebian.sh	2025-11-16 16:31:52 +01:00
create-mkspec.sh	jw-projects.py: Rename it to jw-pkg.py	2026-01-28 15:24:16 +01:00
get-os.sh	get-os.sh: Add support for command tuple	2019-02-27 11:56:54 +00:00
git-srv-admin.sh	Re-add git-srv-admin.sh: Needed for enumerating repos via SSH	2025-11-17 08:52:12 +01:00
ini-tools.sh	Everywhere: Remove everything non-essential for "make clean all"	2025-11-14 15:02:56 +01:00
jw	Revert "scripts: Add __init__.py"	2026-01-26 17:17:23 +01:00
jw-pkg-create-project.sh	Everywhere: Rename package "jw-build" to "jw-pkg"	2025-11-28 13:35:56 +01:00
jw-pkg.py	jw-projects.py: Rename it to jw-pkg.py	2026-01-28 15:24:16 +01:00
make-version-script.sh	make, scripts: Re-add files necessary for building ytools	2025-11-14 15:59:49 +01:00
Makefile	Revert "scripts: Add __init__.py"	2026-01-26 17:17:23 +01:00
mkspec-wrapper.sh	Everywhere: Remove everything non-essential for "make clean all"	2025-11-14 15:02:56 +01:00
pgit.sh	pgit.sh pull: Rebase target branch before merge	2026-01-31 11:13:41 +01:00
pkg.sh	pkg.sh build: Support -a / --include-vcs-files	2025-12-01 11:31:54 +01:00
purge-stale-projects.sh	purge-stale-projects.sh: Support --vcs	2025-11-29 13:28:51 +01:00
python-tools.sh	py-run.mk, python-tools.sh: Re-add files necessary for jw-client-devops-web	2025-11-14 17:15:24 +01:00
scm.sh	scm.sh ls-files: Support -a (all files)	2025-12-01 11:29:53 +01:00
upload.sh	upload.sh: Re-add upload.sh, needed for release pipeline	2025-11-17 02:19:08 +01:00