atlassian-sourcetree

git cherry picking one commit to another branch

天大地大妈咪最大 提交于 2020-01-17 03:14:09
问题 In developing for a work enviornment, we create a branch for each feature or fix we work on, and then merge to QA for testing. Occasionally I find it's helpful to have a stash which contains console.logs' of debugging steps for a specific process. But I want to only have that be a subset of files in my working copy. So, I am considering creating another branch for local use with commits which will be used later. Which don't reference a specific ticket necessarily. So the question is, how can

git CLI commands for stage/unstage hunks/lines like sourcetree

我怕爱的太早我们不能终老 提交于 2020-01-14 14:34:09
问题 Sourcetree makes it easy to stage and unstage hunks. And also easy to select particular lines from within a hunk and stage or unstage them. I am trying to figure out how to do the same from the command line. I tried doing each operation in sourcetree with the command history panel showing. It doesn't show any commands when I perform these operations. For other operations it works fine. On the command line, I use git add in interactive mode, choose the patch option and then select a file with

Can Git software (e.g. Gitbox, Github, SourceTree) use a remote repo instead of local?

烂漫一生 提交于 2020-01-12 05:40:11
问题 I like using Git software to push commits, but the ones I use (Gitbox, Github, SourceTree) all ask for a local repo when adding a new repo to them. Thing is, my repo is on my development server not my local machine. So can Git software use a remote Git repo as a development repo, then push that to your main repo (e.g. Github or Bitbucket)? Otherwise it seems you cannot use the software and have to resort to command line over SSH. Thanks 回答1: One solution, which doesn't rely on the front-end

How to work with two different BitBucket accounts in SourceTree

你说的曾经没有我的故事 提交于 2020-01-11 16:36:20
问题 I have two different bitbucket accounts set up. One is for work projects and one is for personal use. In BitBucket I have set up a repository in each of the accounts for different projects. In SourceTree I have a few existing personal projects that are syncing up to my personal repository on SourceTree. In the left hand panel I can see my "Develop" branch for one of those personal projects and on the remote in BitBucket I can see the remote repo. In SourceTree I don't see an obvious way to

Does Git generally choke on mounted drives? Or just Git GUI's?

故事扮演 提交于 2020-01-11 05:05:16
问题 I know I should be diehard and use git in the terminal, but I use a Git client on Mac called Sourcetree to make the whole thing just a bit more sexy. The problem is a new Synology NAS drive I've added to my setup. With one of the NAS shared folders mounted on my Mac, Sourcetree chokes when trying to stage/commit/push. My master branch is on GitHub, so I cloned a repo to the mounted drive using Sourcetree. As a quick test I edited an unimportant file, saved, and watched for unstaged changes in

'cannot open git-upload-pack' error in Eclipse when cloning or pushing git repository

可紊 提交于 2020-01-09 04:13:40
问题 I am not able to clone or push to a git repository at Bitbucket in Eclipse: It's weird, because a day before I didn't have any problem. I have downloaded the sts 3 times with no luck. This error keeps showing. Also I have installed SourceTree and it says 'This is not a valid source path / URL': If I use git commands to import the project, it works, but I wan't to use EGit for this task, since I am a newbie with git. I don't know if this has to do with it, but in the same directory I have the

SourceTree ssh-agent path is wrong

北慕城南 提交于 2020-01-06 19:29:00
问题 I have updated SourceTree to version 1.6.15 and after that some paths where changed/messed up. Before the update everything went without any issue. Now the ssh-agent fails to start, the window closes automatically in a matter of milliseconds. The logs in the sourcetree (sourcetree.log) show this log when I try to open the ssh-agent: 2015-07-13T09:30:32: Attempt to start ssh-agent.exe process [C:\Program Files (x86)\Git\usr\bin\ssh-agent.exe] I have checked the path of the ssh-agent and it is

SourceTree ssh-agent path is wrong

懵懂的女人 提交于 2020-01-06 19:27:54
问题 I have updated SourceTree to version 1.6.15 and after that some paths where changed/messed up. Before the update everything went without any issue. Now the ssh-agent fails to start, the window closes automatically in a matter of milliseconds. The logs in the sourcetree (sourcetree.log) show this log when I try to open the ssh-agent: 2015-07-13T09:30:32: Attempt to start ssh-agent.exe process [C:\Program Files (x86)\Git\usr\bin\ssh-agent.exe] I have checked the path of the ssh-agent and it is

How to ignore existing file in Git?

风格不统一 提交于 2019-12-31 21:37:11
问题 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? 回答1: 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. 回答2:

How to ignore existing file in Git?

孤人 提交于 2019-12-31 21:37:08
问题 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? 回答1: 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. 回答2: