68:c90c3504fbb3
Anton Shestakov <engored@ya.ru>, Sun, 21 Dec 2014 17:16:28 +0800
git prompt: show merges (without conflict)

next change 70:b2ed3aee8024
previous change 67:0a7e0a69a670

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 --strategy=ours --no-commit