Timeline for How to diff a commit with its parent
Current License: CC BY-SA 4.0
12 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Jul 7, 2021 at 17:44 | history | edited | Peter Mortensen | CC BY-SA 4.0 |
Active reading [<https://en.wikipedia.org/wiki/Git> <https://en.wikipedia.org/wiki/Man_page> <https://www.youtube.com/watch?v=1Dax90QyXgI&t=17m54s>].
|
| Jul 27, 2017 at 5:28 | comment | added | hIpPy |
The ^! parent shorthand notation works properly with difftool for normal commits but the diff is reversed for merge commits. Why so?
|
|
| Mar 16, 2015 at 10:52 | comment | added | Jakub Narębski |
@jmiserez: HEAD@{1} specifies a commit. I'll explain that r1 can be any commit-ish.
|
|
| Mar 16, 2015 at 9:17 | comment | added | jmiserez |
No need to specify the commit: git difftool HEAD@{1}^! works as well.
|
|
| Apr 9, 2013 at 15:26 | comment | added | RichVel | @JakubNarębski: yes, much better! I now use this shortcut all the time - thanks. | |
| Apr 6, 2013 at 11:28 | history | edited | Jakub Narębski | CC BY-SA 3.0 |
expand explanation of r1^! notation, add link to gitrevisions manpage, add hline
|
| Apr 6, 2013 at 7:56 | comment | added | RichVel | @JakubNarębski: good point, maybe you could edit your answer to summarise your understanding of the single-parent and multi-parent cases - separate statements on each might be easier to understand. | |
| Apr 5, 2013 at 19:38 | comment | added | Jakub Narębski | @RichVel: it is a bit confusing because it tries to describe also the situation where commit has more than one parent (is a merge commit). r1^! works as expected also then. | |
| Apr 5, 2013 at 16:49 | comment | added | RichVel | This should be the accepted answer, it's much neater. However, the last sentence of the git-rev-parse extract is rather confusing - seems like it means 'range from this commit's parent to this commit'. | |
| Jan 17, 2013 at 9:52 | history | edited | akavel | CC BY-SA 3.0 |
reformulated to start with a straightforward answer to the actual question asked
|
| S Jan 16, 2009 at 0:43 | history | answered | Jakub Narębski | CC BY-SA 2.5 | |
| S Jan 16, 2009 at 0:43 | history | made wiki | Post Made Community Wiki by Community Bot |