[git-users] Merging from pull

2013-12-05 Thread Phillip Tutt
Hi guys, I am pretty new to git, but I have found that it doesn't work as I would expect. I work sometimes from my laptop and other times from my desktop, each having a local git repository. I have set up a remote, which I push the changes from my branches to. Now, what I would expect is

[git-users] jgit checkout problem

2013-12-05 Thread Tal Agmon
Hi, I'm trying to use CheckoutCommand the following way: Git git = new Git(repository); CheckoutCommand checkoutCommand = git.checkout(); checkoutCommand.setUpstreamMode(CreateBranchCommand.SetupUpstreamMode.SET_UPSTREAM); checkoutCommand.setStartPoint(origin/ + branchName);

Re: [git-users] jgit checkout problem

2013-12-05 Thread Konstantin Khomoutov
On Thu, 5 Dec 2013 07:13:23 -0800 (PST) Tal Agmon agmon...@gmail.com wrote: I'm trying to use CheckoutCommand the following way: [...] Can you please advise? I'm sure it would be much better to ask this question on some resource dedicated to JGit or may be even in its bug tracker. JGit is not

[git-users] how merge master *into* gh-pages

2013-12-05 Thread Owen Densmore
I've modified the auto generated gh-pages templates with a few edits converts it to simply read the README.md. This results in 5 files that are only for the gh-pages hosting, not part of my repo. And never change after the first edit commit. Is there a way for me to merge my local master,