From 8bbe2828d442ba83903f8a5877286a8a929923cd Mon Sep 17 00:00:00 2001 From: Tobias Grothe Date: Tue, 11 Nov 2025 20:51:48 +0100 Subject: [PATCH] Default update at 2025-11-11-20-51 --- README.md | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3aa9a95..338ecbd 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,25 @@ # java-template -Template repository for Java + +Template repository for Java. + +## Usage + +To use this template, click the "Use this template" button on the repository page to create a new repository based on this template. + +## Update from this template (if you used it to create your repository and want to get updates) + +```sh +# new branch +git checkout -b update-from-template +# cherry-pick... +git fetch https://github.com/tgrothe/java-template.git main && git cherry-pick FETCH_HEAD +# see changes to push before push +git diff origin/main +# push... +git push + +# to see changes before cherry-pick, use: +# git fetch https://github.com/tgrothe/java-template.git main && git diff FETCH_HEAD +``` + +_By the way: A "pull ... --allow-unrelated-histories" would also be possible, but this affects the history, and causing chaos. :S_