I want to be able to tell what git command was executed for example when I use the Resove Conflicts/Resolve using 'Mine' and Resolve using 'Theirs' option.
The Last command can be dispayed when checking:
(SourceTree|Win|22.214.171.124) Tools>Options>Repo Settings>Always display full console output
'View>Show Command output' I haven't found
See the complete History like using the console would be pretty. Maybe with direct possibility to take over to cmd-usage.
For many commands you can set the 'Always Show Full Output' option in Preferences, which will always show the output window with the command and console output. However minor commands like add/remove and resolve don't use a full task window like this.
FYI the command for both commands is:
git cat-file blob [sha]:[filename] > [filename] git add [filename]
Where 'sha' is the commit from the merged branch for 'Resolve Using Theirs', and HEAD for 'Resolve Using Mine'. This is done so that the clean copy from one or other side of the merge is used to resolve the conflict - if you want something else you should either edit the file manually or use the visual merge route.
Rather than a dialog I have to close each time, I would just like a IDE-like console window (or even external log file I can check). Often I realize a few commands later I would like some key piece of the output (SHAs, conflict info, etc).
Is there something like that hidden somewhere? Thanks, d
Using Bootcamp, I compared SourceTree in Win7 to SourceTree in MAC (Yosemite). On the MAC, the latest version (as of Dec 14, 2014) is SourceTree 2.0.3. Unlike the Windows version, the MAC version (as shown in the attached image) will display the command history at the bottom of the SourceTree window if "View....Show command output" is checked. Note that It does not show git commands manually typed into the SourceTree git terminal, it only shows commands generated by the SourceTree GUI itself. Incidentally, the MAC version of SourceTree uses an embedded GIT (version 126.96.36.199) but has an option to use System Git. I took that option so that the terminal window and the GUI both use System Git version 1.9.3 (from /usr/bin/git).
Works for me in Windows 7 using version 188.8.131.52. For example, when I click "Push", at the conclusion a modal window appears (with an "OK" button) that shows a checkbox with "Show Full Output" checked. Beneath the checkbox it shows the git command issued. For example in this case it shows:
git -c diff.mnemonicprefix=false -c core.quotepath=false push -v --tags origin gh-pages:gh-pages master:master
Yes I've been using the "Show Full Output" option for a long time, but that's just the _last_ command issued. What I'd like to see is a full running log of _all_ commands issued in a given session, similar to what you'd get working with Git from the command-line, so that if a problem of some sort arises, I can go back and review previous sequence of commands to troubleshoot. According to Nicholas Gard's comment on Jul 03, 2014, the Mac version of SourceTree includes this capability but the latest version for Windows (184.108.40.206 I believe) still does not. Given that it's in the Mac version, it'd be nice to see it ported over to the Windows version.
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events