-
Notifications
You must be signed in to change notification settings - Fork 22
/
Copy pathgit-rebase-diff.html
57 lines (50 loc) · 2.37 KB
/
git-rebase-diff.html
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
<html>
<meta content="width=device-width, initial-scale=1.0" name="viewport">
<head>
<title>
leontrolski - diffing after rebase
</title>
<style>
body {margin: 5% auto; background: #fff7f7; color: #444444; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; font-size: 16px; line-height: 1.8; max-width: 63%;}
@media screen and (max-width: 800px) {body {font-size: 14px; line-height: 1.4; max-width: 90%;}}
pre {width: 100%; border-top: 3px solid gray; border-bottom: 3px solid gray;}
a {border-bottom: 1px solid #444444; color: #444444; text-decoration: none; text-shadow: 0 1px 0 #ffffff; }
a:hover {border-bottom: 0;}
.inline {background: #b3b2b226; padding-left: 0.3em; padding-right: 0.3em; white-space: nowrap;}
blockquote {font-style: italic;color:black;background-color:#f2f2f2;padding:2em;}
details {border-bottom:solid 5px gray;}
</style>
<link href="https://unpkg.com/[email protected]/themes/prism-vs.css" rel="stylesheet">
<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.20.0/components/prism-core.min.js">
</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.20.0/plugins/autoloader/prism-autoloader.min.js">
</script>
</head>
<body>
<a href="index.html">
<img src="pic.png" style="height:2em">
⇦
</a>
<p><i>2022-04-19</i></p>
<h1>
<code class="inline">git diff</code>
after a rebase
</h1>
<p>
After doing a particularly hairy rebase, you want to check what changed (intentionally or otherwise), but only in the files you worked on originally.
</p>
<p>
After rebasing, you try:
</p>
<pre class="language-bash"><code>git diff origin/my-special-branch my-special-branch</code>
</pre>
<p>
But there's a load of changes that other contributors have made that you don't care about!
</p>
<p>
Here's how to restrict the diff:
</p>
<pre class="language-bash"><code>BRANCH=my-special-branch; git diff origin/$BRANCH $BRANCH -- $(git diff master $BRANCH --name-only)</code>
</pre>
</body>
</html>