![]() ![]() GitKraken is a primary focus of Axosoft’s development team, making it possible to provide frequent updates and improvements, in addition to discoverable and helpful Learn Git resources and support. Having varied features across OS can be challenging when you need to troubleshoot an issue. 4įurthermore, Sourcetree is not a focus of Atlassian, shown by a lack in communication and infrequent application updates. Users often complain of frustrating discrepancies between versions. Sourcetree’s experience varies greatly depending on whether you’re using the tool on Windows or Mac. Empowering your engineers with the tools they want to use will lead to happier employees and improved productivity. Not only is this feature appealing to developers, who in turn get to use the OS of their preference, it’s also beneficial for teams and organizations. We formerly covered that GitKraken is able to offer an identical experience of our application across Windows, Mac, and Linux. I'll look into the many excellent suggestions here when I need something more sophisticated - but I think this is directly responsive to the OP.Cross-Platform Consistency GitKraken ✅ | Sourcetree ❌ The above script did what I wanted without dealing with any of that. This approach is probably pretty naive, but looking through a lot of the solutions here and at a related post, many involved installing new tools on a system where I don't have admin access, with interfaces that had their own learning curve. If you're not a vim user, you can replace vimdiff with your favorite diff tool.īehavior is to output the commit comments when relevant changes are found and start offering vimdiff runs for each changed file (that's git difftool behavior, but it works here). If you're checking changes to specific files and want to start from the beginning, you'll need to provide an empty string for arg1. Any args after the first will limit the difference reports to include only the files listed among those args (which I think is what the OP wanted, and I'd recommend for all but tiny projects). RunDiff $OLDVERS $NEWVERS with no args, this will start from the beginning of the repo history, otherwise it will start with whatever abbreviated commit hash you provide and proceed to the present - you can ctrl-C at any time to exit. Git difftool -tool=vimdiff $GIT1 $GIT2 NEWVERS in $(git log -format=format:%h -reverse) I wasn't too happy with answers I was finding, so I threw this git incremental reporter (gitincrep) script together and it's been useful to me: #!/usr/bin/env bash I'm probably about where the OP was when this started, looking for something simple that would let me use git difftool with vimdiff to review changes to files in my repo starting from a specific commit. If you need to specify the filename, just do so with: git difftool 04b67fb~.04b67fb - path/to/file.c ![]() Note that I intentionally leave off the filename so that it can properly track the file automatically for me since the file was renamed, and I know these commits likely only edited this file anyway: # just the last change Now I can just look at the last changes graphically in meld like this (pulling the commit hashes from the output above). ![]() Sample run and output: eRCaGuy_hello_world$ git log -follow -oneline - c/alsa_aplay_play_tone_sound_WIP.cĠ4b67fb (HEAD -> master) Update c/alsa_aplay_play_tone_sound_WIP.cģ01122a wip: alsa_aplay_play_tone_sound.c: finish initial version of programĭ4e8092 wip: add c/alsa_aplay_play_tone_sound.c If you want to just see which commits changed a file, so you can do git difftool on them to graphically see the changes with meld (as I explain here), do this instead: git log -follow -oneline - path/to/file.c How to manually view the change history of a file graphically in meld
0 Comments
Leave a Reply. |