git town sync --verbose

gistfile1.txt

$ git town sync --verbose

(verbose) git version
git version 2.44.0.478.gd926399ef9-goog

(verbose) git config -lz --global
push.default
simplepush.autosetupremote
trueurl.sso://user/peterhornyack/.insteadof
me:url.ssh://git@github.com/.insteadof
https://github.com/user.name
Peter Hornyackuser.email
peterhornyack@google.comuser.signingkey
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIs+Rdk22RSEBDzv7KGJtT5oIQ8qI2mlHGuxdc2iXCVl peterhornyack@google.comcore.excludesfile
~/.gitignorecore.abbrev
12core.safecrlf
warncolor.ui
autopretty.fixes
Fixes: %h ("%s")alias.hist
log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=shortmerge.tool
kdiff3stash.showpatch
truegpg.format
sshcommit.gpgsign
truerebase.updaterefs
truebranch.sort
-committerdatererere.enabled
true
(verbose) git config -lz --local
core.repositoryformatversion
0core.filemode
truecore.bare
falsecore.logallrefupdates
trueremote.origin.url
git@github.com:pjh/git-town.gitremote.origin.fetch
+refs/heads/*:refs/remotes/origin/*branch.main.remote
originbranch.main.merge
refs/heads/maingit-town.main-branch
maingit-town.perennial-branches
git-town-branch.branch1.parent
mainbranch.branch1.remote
originbranch.branch1.merge
refs/heads/branch1
(verbose) git rev-parse --show-toplevel
/usr/local/.../peterhornyack/github/pjh/git-town

(verbose) git stash list

(verbose) git branch -vva
* branch1                3fc2de69aa8e [origin/branch1: ahead 1] Add more README text
  remotes/origin/HEAD    -> origin/main
  remotes/origin/main    bd2f0a192fea Merge pull request #2 from pjh/banana
  remotes/origin/banana  0365a6adb99b Add banana file
  remotes/origin/branch1 f9d8e1315d30 Add README
  main                   135fe9870e64 [origin/main: behind 2] Initial commit

(verbose) git remote
origin

[branch1] git fetch --prune --tags

(verbose) git branch -vva
* branch1                3fc2de69aa8e [origin/branch1: ahead 1] Add more README text
  remotes/origin/HEAD    -> origin/main
  remotes/origin/main    bd2f0a192fea Merge pull request #2 from pjh/banana
  remotes/origin/banana  0365a6adb99b Add banana file
  remotes/origin/branch1 f9d8e1315d30 Add README
  main                   135fe9870e64 [origin/main: behind 2] Initial commit

(verbose) git rev-parse --verify --abbrev-ref @{-1}
main

(verbose) git status --long --ignore-submodules
On branch branch1
Your branch is ahead of 'origin/branch1' by 1 commit.
  (use "git push" to publish your local commits)

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        scrollback.txt

nothing added to commit but untracked files present (use "git add" to track)
[branch1] git add -A

[branch1] git stash
Saved working directory and index state WIP on branch1: 3fc2de69aa8e Add more README text

[branch1] git checkout main
Switched to branch 'main'
Your branch is behind 'origin/main' by 2 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

[main] git push -u origin main
To github.com:pjh/git-town.git
 ! [rejected]                  main -> main (non-fast-forward)
error: failed to push some refs to 'github.com:pjh/git-town.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. If you want to integrate the remote changes,
hint: use 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

(verbose) git config -lz --global
push.default
simplepush.autosetupremote
trueurl.sso://user/peterhornyack/.insteadof
me:url.ssh://git@github.com/.insteadof
https://github.com/user.name
Peter Hornyackuser.email
peterhornyack@google.comuser.signingkey
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIs+Rdk22RSEBDzv7KGJtT5oIQ8qI2mlHGuxdc2iXCVl peterhornyack@google.comcore.excludesfile
~/.gitignorecore.abbrev
12core.safecrlf
warncolor.ui
autopretty.fixes
Fixes: %h ("%s")alias.hist
log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=shortmerge.tool
kdiff3stash.showpatch
truegpg.format
sshcommit.gpgsign
truerebase.updaterefs
truebranch.sort
-committerdatererere.enabled
true
(verbose) git config -lz --local
core.repositoryformatversion
0core.filemode
truecore.bare
falsecore.logallrefupdates
trueremote.origin.url
git@github.com:pjh/git-town.gitremote.origin.fetch
+refs/heads/*:refs/remotes/origin/*branch.main.remote
originbranch.main.merge
refs/heads/maingit-town.main-branch
maingit-town.perennial-branches
git-town-branch.branch1.parent
mainbranch.branch1.remote
originbranch.branch1.merge
refs/heads/branch1
(verbose) git branch -vva
  branch1                3fc2de69aa8e [origin/branch1: ahead 1] Add more README text
  remotes/origin/HEAD    -> origin/main
  remotes/origin/main    bd2f0a192fea Merge pull request #2 from pjh/banana
  remotes/origin/banana  0365a6adb99b Add banana file
  remotes/origin/branch1 f9d8e1315d30 Add README
* main                   135fe9870e64 [origin/main: behind 2] Initial commit

(verbose) git stash list
stash@{0}: WIP on branch1: 3fc2de69aa8e Add more README text

(verbose) git status --long --ignore-submodules
On branch main
Your branch is behind 'origin/main' by 2 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

nothing to commit, working tree clean

Ran 20 shell commands.
Error: exit status 1

To go back to where you started, run "git-town undo".
To continue after having resolved conflicts, run "git-town continue".
To continue by skipping the current branch, run "git-town skip".