AdeAttwood/Dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(sapling): add ddd alias for diffing like ... diff from git

Browse source 
When using sapling I often use `HEAD...origin/main` to diff the current
changes. This replicates this so you can diff a commit with other changes and
or merge commits in it.
This commit is contained in:
Ade Attwood 2024-11-28 17:58:57 +00:00
parent 6da50c9bac
commit ff6fd2b144
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
site-modules/core/templates/sapling.conf.liquid
View file

@ -32,3 +32,8 @@ pager = delta
nvim_diff.executable = nvim nvim_diff.executable = nvim
nvim_diff.args = -d $base $local $other nvim_diff.args = -d $base $local $other
nvim_diff.priority = 1 nvim_diff.priority = 1
[revsetalias]
# Diff between two revs. This is the same as `<rev>...<rev>`, unlike `a::b`
# this is equivalent to `a..b` in git.
ddd(a, b) = ancestor(a, b)::b