| ... | ... | @@ -63,5 +63,3 @@ $ interdiff <(git diff origin/master...camata/branchname@{1}) <(git diff origin/ |
|
|
|
Note @{1} here - it means how that branch was 1 change _before_. (You can read more about it in git-reflog documentation https://git-scm.com/docs/git-reflog)
|
|
|
|
|
|
|
|
Generally speaking using plaing `git diff t t2` is not correct, because base revision for those two patchsets can be different (origin/master could be not the same for t2, compared when t was created) and the diff will include what has been changed in origin/master@{1}..origin/master - not your changes. |
|
|
|
|
|
|
|
But in case base commit is the same, plain `git diff t t2` or `git diff camata/branchname@{1}..camata/branchname` works ok. |
