248:feaf2a7bd655
Anton Shestakov <av6@dwimlabs.net>, Sat, 26 Nov 2022 02:41:55 +0400
.vimrc: one day vimscript will let us have spaces around operators everywhere Today we prepare for that day, for it will come. I might've looked at https://favadi.com/update-your-vimrc-to-vim9-script/

previous change 70:b2ed3aee8024

docs/prompt-session-git.sh

Permissions: -rw-r--r--

Other formats: Feeds:
#!/bin/false
# paste this into an interactive shell
git init -q gitrepo && cd gitrepo
echo 'a' > foo
git add foo
git commit -q -m 'a'
echo 'b' >> foo
git stash -q
git stash pop -q && git commit -q -a -m 'b'
git checkout -q HEAD@{1}
git checkout -q -b secret
echo 's' >> foo && git commit -q -a -m 's'
git merge master
git reset --merge
git merge master --strategy=ours --no-commit