atlassian-sourcetree

I have the following in my .gitconfig file: [user] name = myname email = myname@gmail.com [core] autocrlf = true excludesfile = C:\\Users\\myname\\Documents\\gitignore_global.txt [diff] tool = meld [difftool "meld"] cmd = "C:/Program Files (x86)/Meld/meld/meld.exe" prompt = false [merge] tool = meld [mergetool "meld"] cmd = "C:/Program Files (x86)/Meld/meld/meld.exe" [difftool "sourcetree"] cmd = "C:/Program Files (x86)/Meld/meld/meld.exe $PWD/$LOCAL $PWD/$BASE $PWD/$REMOTE" [mergetool "sourcetree"] cmd = 'C:/Program Files (x86)/Meld/meld/meld.exe' \"$LOCAL\" \"$REMOTE\" \"$MERGED\"

I have an SSH access to my web hosting, it works great with PuTTY (I just had to enter my domain, username and password), however it seems much more complicated with SourceTree. While PuTTY has a field for "Host Name", "username" and "password", SourceTree doesn't and requires a special file " .ppk "?! I need to connect SourceTree to my web hosting via SSH for the obvious reason that I want to use it to push to a remote repository located on my web hosting. So how do I get a .ppk file generated from my domain/username/password? Any help greatly appreciated! PS: I've noticed that they made it

Recently in a project with multiple people, a commit was made as seen in the image below. Marked in red you can see a commit with the description/comment of 'Merge?'. This commit added numerous files and altered numerous others and was never intended to take place. Using atlassian-sourcetree what do I need to do to roll everything back to the commit highlighted in blue? (I am 8 commits behind as seen in the screenshot.) If you have pushed the commits upstream... Select the commit you would like to roll back to and reverse the changes by clicking Reverse File , Reverse Hunk or Reverse Selected

I am working on a maven project and I want to ignore the files generated and stored in the /target folder of my project (Evaluation) root folder.In the root of my git repository I have a .gitignore file with the following entries (backend is just a folder which contains the eclipse project Evaluation) backend/Evaluation/logs/ backend/Evaluation/target/ For some reason SourceTree does not ignore the files stored in these two folders and when I compile my project there are some uncommitted changes which are some .class files inside the /target folder. Why is this happening ? I also tried to

Does Sourcetree offer a way to visualize differences between git branches? I'm looking for: names of files that have changed diffs between these files Anton Glukhov Use ⌘ (OSX) or CTRL (Windows and Linux) and choose any two commits you like in log view. It does not matter what branch the commits belong to. As a result you will see something like... Displaying all changes between f03a18bf0370c62bb5fb5c6350589ad8def13aea and 4a4b176b852e7c8e83fffe94ea263042c59f0548 ...down below. Gan Another way to do this is to right-click on a branch and select the "Diff against current" context menu command (

Im trying to push to github with sourcetree but get the following error: git -c diff.mnemonicprefix=false -c core.quotepath=false push -v --tags origin live_version:live_version remote: Invalid username or password. fatal: Authentication failed for ' https://github.com/myname/myrepo/ ' Pushing to https://github.com/myname/myrepo Completed with errors, see above. However when I go to tools > authentication > my github account And click edit > refresh oauth token A page opens and I get: Authentication Successful SourceTree has been successfully authenticated. You may now close this page. It

In Atlassian SourceTree, how to know which tags are only local and which are also in remote? When creating a tag you get the option "Push tag to: ...", but how to know if a tag has been pushed or not after it is created? I can see all my tags locally, but I need to be sure that they are present in remote so that other developers can pull them. Even without cloning or fetching, you can check the list of tags on the upstream repo with git ls-remote : git ls-remote --tags /url/to/upstream/repo (as illustrated in " When listing git-ls-remote why there's “ ^{} ” after the tag name? ") Note that you

I have a feeling my git cache is getting confused fairly often. I work on Mac and use both git at terminal and SourceTree. I add or modify few files but I often notice that even files I have never modified in any way show as staged. This is very confusing already. However, even more confusing is that often issuing git add . to add all of the files to staging area does nothing. I have been using git for few years and have never had this before. I read all posts here on SO and none of them resolved this issue for me. I found one suggestion to clear git cache like: git rm --cached path/to/file

Whenever I use anything Git related on my Macbook (Brand-new Macbook Pro with El Capitan), it takes almost a full minute for each command. I did a simple GIT_TRACE=1 git stash and got back this: 17:04:27.460826 git.c:557 trace: exec: 'git-stash' 17:04:27.463136 run-command.c:347 trace: run_command: 'git-stash' 17:04:32.503827 git.c:348 trace: built-in: git 'rev-parse' '--git-dir' 17:04:34.521223 git.c:348 trace: built-in: git 'rev-parse' '--show-toplevel' 17:04:35.527473 git.c:348 trace: built-in: git 'config' '--get-colorbool' 'color.interactive' 17:04:36.534443 git.c:348 trace: built-in: git