Created attachment 237198 [details] git-extras-6.5.0.diff
Committed, Thanks!
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ccd12b970a94128c78110c67eb5e45ea5e94b30 commit 3ccd12b970a94128c78110c67eb5e45ea5e94b30 Author: Igor Ostapenko <igor.ostapenko@pm.me> AuthorDate: 2022-10-11 05:36:14 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2022-10-11 15:43:21 +0000 devel/git-extras: Update to 6.5.0 ChangeLog: https://github.com/tj/git-extras/releases/tag/6.5.0 * Include revert conflicts in git abort * fix(git-effort):fork: retry: Resource temporarily unavailable * git-sync --force will sync without interaction * fix(git-cp): keep the history of the files * git-bulk: previous refactor redirected $PWD to stderr by mistake * Fix lazy loading bash_completion from XDG_DATA_DIRS * feat(bin/git-browse): open website at file & line number or range * #970 standup added -A flag for author date * update git-utimes.{1,html} to add --newer flag * git-utimes: add --newer flag and don't touch files in the working tree and index * docs(instllation): replace git.io * Added config git-extras.standup-implicit-week for git standup * Document git standup -w option PR: 266953 Reported by: igor.ostapenko@pm.me (maintainer) devel/git-extras/Makefile | 2 +- devel/git-extras/distinfo | 6 +++--- devel/git-extras/files/patch-Makefile | 22 +++++++++++++++++++++- devel/git-extras/pkg-plist | 2 +- 4 files changed, 26 insertions(+), 6 deletions(-)