equal
deleted
inserted
replaced
111 Show difference between revisions:: |
111 Show difference between revisions:: |
112 |
112 |
113 $ git diff $rev1..$rev2 |
113 $ git diff $rev1..$rev2 |
114 $ git diff ORIG_HEAD..HEAD |
114 $ git diff ORIG_HEAD..HEAD |
115 |
115 |
|
116 For merge first parent is a tip where merge is performed, second is a tip of merged branch. |
|
117 |
|
118 .. note:: ``git show`` shows "combined diff": only files which were modified from all parents. |
|
119 ``git show --first-parent`` can be used to show how branch was chaged after merge. |
|
120 |
|
121 Show differences to each parent for merge:: |
|
122 |
|
123 $ git show -m $hash |
|
124 |
116 https://stackoverflow.com/questions/3293607/difference-between-git-head-and-the-current-project-state |
125 https://stackoverflow.com/questions/3293607/difference-between-git-head-and-the-current-project-state |
117 Difference between git HEAD and the current project state? |
126 Difference between git HEAD and the current project state? |
|
127 https://stackoverflow.com/questions/40986518/git-show-of-a-merge-commit |
|
128 git show of a merge commit. |
118 |
129 |
119 Undo tracking added file. |
130 Undo tracking added file. |
120 ========================= |
131 ========================= |
121 |
132 |
122 You do:: |
133 You do:: |