163:41a60371e872
Anton Shestakov <av6@dwimlabs.net>, Fri, 18 Jan 2019 20:42:56 +0800
.vimrc: add word bounds to python 2 vs 3 check, just in case

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