Page MenuHomeFreeBSD
Files F45216436

963f5e07c18c.txt
grahamperrin (Graham Perrin)
Actions

Authored By
grahamperrin
Jul 19 2022, 3:29 AM
Size
4 KB
Referenced Files
None
Subscribers
None

963f5e07c18c.txt
View Options

% date ; whoami ; pwd
Tue 19 Jul 2022 02:30:01 BST
grahamperrin
/usr/doc
% git -C /usr/doc config --list | sort
branch.main.merge=refs/heads/main
branch.main.remote=origin
branch.patch-7.merge=refs/heads/patch-7
branch.patch-7.remote=origin
core.bare=false
core.filemode=true
core.logallrefupdates=true
core.repositoryformatversion=0
remote.freebsd.fetch=+refs/heads/*:refs/remotes/freebsd/*
remote.freebsd.fetch=+refs/notes/*:refs/notes/*
remote.freebsd.pushurl=git@repo.freebsd.org:doc.git
remote.freebsd.url=https://git.freebsd.org/doc.git
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.gh-resolved=base
remote.origin.url=https://github.com/grahamperrin/freebsd-doc.git
remote.upstream.fetch=+refs/heads/main:refs/remotes/upstream/main
remote.upstream.url=https://github.com/freebsd/freebsd-doc.git
safe.directory=/usr/doc
user.email=grahamperrin@FreeBSD.org
user.name=Graham Perrin
% cat /usr/doc/.git/config
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
url = https://github.com/grahamperrin/freebsd-doc.git
fetch = +refs/heads/*:refs/remotes/origin/*
gh-resolved = base
[branch "main"]
remote = origin
merge = refs/heads/main
[remote "upstream"]
url = https://github.com/freebsd/freebsd-doc.git
fetch = +refs/heads/main:refs/remotes/upstream/main
[remote "freebsd"]
fetch = +refs/notes/*:refs/notes/*
url = https://git.freebsd.org/doc.git
fetch = +refs/heads/*:refs/remotes/freebsd/*
pushurl = git@repo.freebsd.org:doc.git
[branch "patch-7"]
remote = origin
merge = refs/heads/patch-7
[user]
name = Graham Perrin
email = grahamperrin@FreeBSD.org
% git -C /usr/doc branch
* main
patch-7
% git -C /usr/doc pull --ff-only
Already up to date.
% git -C /usr/doc checkout -b D35838
Switched to a new branch 'D35838'
% git -C /usr/doc pull --ff-only
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.
git pull <remote> <branch>
If you wish to set tracking information for this branch you can do so with:
git branch --set-upstream-to=<remote>/<branch> D35838
% git -C /usr/doc branch --set-upstream-to=upstream/main D35838
branch 'D35838' set up to track 'upstream/main'.
% git -C /usr/doc pull --ff-only
From https://github.com/freebsd/freebsd-doc
9b6154ac2a..57c6b5b4a1 main -> upstream/main
Already up to date.
% git -C /usr/doc apply /tmp/D35838.diff
% git -C /usr/doc switch main
M website/content/en/internal/new-account.adoc
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
% git -C /usr/doc switch D35838
M website/content/en/internal/new-account.adoc
Switched to branch 'D35838'
Your branch is up to date with 'upstream/main'.
% git -C /usr/doc status
On branch D35838
Your branch is up to date with 'upstream/main'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: website/content/en/internal/new-account.adoc
no changes added to commit (use "git add" and/or "git commit -a")
% git -C /usr/doc add .
% git -C /usr/doc status
On branch D35838
Your branch is up to date with 'upstream/main'.
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
modified: website/content/en/internal/new-account.adoc
% git -C /usr/doc commit -a
[D35838 963f5e07c1] New Account Creation Procedure: correct two links
1 file changed, 2 insertions(+), 2 deletions(-)
% git -C /usr/doc push freebsd HEAD:main
Enter passphrase for key '/home/grahamperrin/.ssh/id_rsa':
Enumerating objects: 13, done.
Counting objects: 100% (13/13), done.
Delta compression using up to 4 threads
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 840 bytes | 46.00 KiB/s, done.
Total 7 (delta 6), reused 0 (delta 0), pack-reused 0
`To repo.freebsd.org:doc.git
57c6b5b4a1..963f5e07c1 HEAD -> main
% git -C /usr/doc switch main
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
% git -C /usr/doc branch -d D35838
error: The branch 'D35838' is not fully merged.
If you are sure you want to delete it, run 'git branch -D D35838'.
% git -C /usr/doc branch -D D35838
Deleted branch D35838 (was 963f5e07c1).
% rm /tmp/D35838.diff
%

File Metadata

Mime Type
text/plain
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4956121
Default Alt Text
963f5e07c18c.txt (4 KB)

Event Timeline