atlassian-sourcetree

I need to work on file.txt locally and in Git, with different content. I want Git not to tell me that there have been changes to that file. Is this possible? Tom Auger Actually, you want --skip-worktree , not --assume-unchanged . Here's a good explanation why . So git update-index --skip-worktree file.txt TLDR; --assume-unchanged is for performance, for files that won't change (like SDKs); --skip-worktree is for files that exist on remote but that you want to make local (untracked) changes to. janos Maybe you want to "pretend" that the file hasn't changed when actually it did? You can do that

How do I continue cherry picking using SourceTree after I resolved confilcts. If I am doing rebase and I get conflicts then after resolving them when I click commit SourceTree lets me continue that rebase. But how to continue cherry pick operation? cherry-pick effectively applies the changes from commit A onto the working tree and makes a commit. This means if you get any conflicts during cherry-pick ing you just need to commit after resolving them to finish the cherry-pick . EDIT Edward noted that this is only true when you are cherry-pick ing a single commit. When picking multiple commits

Can someone give me a quick walkthrough on simply cloning a repo with SourceTree? In Bookmarks, I click on Clone Repository. For Source Path I paste in the URL which looks like this: git@codebasehq.com:client/appname/ios-application.git But I get "This is not a valid source path / URL". I'm copying directly from the Repository Browser in codebase so I know the URL is correct. What else do I need to do? Y Zhang My solution was to change the Git version from 'Use Embedded Git' to 'Use System Git'. Because I installed GitHub on my computer earlier, it seems SourceTree chose that Git by default

In TortoiseGit and TortoiseSVN it is possible to export all changed files between two revisions, including the directory structure, to an external folder. Is there a way to do so in Atlassian SourceTree (for Windows)? Try this: git archive --output=test_zip.zip HEAD $(git diff --diff-filter=ACMRTUXB --name-only hash1 hash2) Just replace the hash 1 and hash 2 in the example with the desired commits hash and name the zip file where you want your change to be zipped. It works for me Here's a solution using 7zip with a Custom Action ( Tools > Options > Custom Actions > Add ): Menu caption: > dist

How can I update git sub modules in SourceTree? I couldn't find the answer myself, so I created a custom action. Go to Preferences, Custom Actions, and enter the following info: (This is on a Mac. Your path to the git executable may vary.) Just double-click on the submodule or left-click and open the module Once in the submodule, the UI is like any git repo , press on pull/fetch to update to the header. And voila. Here is the windows version: This command assumes the location of your sh.exe - depending on how you setup SourceTree it could be somewhere else. /c %LOCALAPPDATA%\Atlassian

Why doesn't the graph in Sourcetree display a new branch branching off from the master branch , when I create a new branch called "testing123" in terminal ? Sourcetree recognises the new branch but it doesn't branch off from the master branch in the graph. Why is this happening ? How can I make Sourcetree graph display the new branch branching off from master? It does: it has one new commit done from master . That means you have checked out the new branch testing123 , done one commit and pushed it (hence origin/ testing123 ). You don't see any "branching" because there is no new commit on