path: root/contrib
diff options
authorDenton Liu <>2020-09-20 11:22:25 (GMT)
committerJunio C Hamano <>2020-09-21 04:30:26 (GMT)
commit0f5a1d449b9538c2765de9d6683abbb83a7fb4e2 (patch)
tree29cbd67c4138aed23542fb1030c3c718bba6ae9e /contrib
parentdf7dbab881c1aa697f0826d8d00f73d43815acf5 (diff)
builtin/diff-index: learn --merge-base
There is currently no easy way to take the diff between the working tree or index and the merge base between an arbitrary commit and HEAD. Even diff's `...` notation doesn't allow this because it only works between commits. However, the ability to do this would be desirable to a user who would like to see all the changes they've made on a branch plus uncommitted changes without taking into account changes made in the upstream branch. Teach diff-index and diff (with one commit) the --merge-base option which allows a user to use the merge base of a commit and HEAD as the "before" side. Signed-off-by: Denton Liu <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions