288:fa2ce712a8b0
Anton Shestakov <av6@dwimlabs.net>, Mon, 16 Sep 2024 00:48:36 +0400
.hgrc: dp1 and dp2 aliases to diff for sanity-checks of merges An extra alias "d" is needed to make sure `hg d` still works after we add other commands starting with "d". `--from` and `--to` are hg 5.7+, they provide clearer UI, but you can still use `hg diff -r foo -r bar`.
previous change 70:b2ed3aee8024

docs/prompt-session-git.sh

Permissions: -rw-r--r--

File Latest Revisions Annotate Diff Comparison
Other formats:
JSON Raw
Feeds:
Atom RSS 
#!/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