Wow, now even post-review for RB works fine for me.
Following KDE's TechBase I inserted this into my ~/.gitconfig
---
[alias]
post-review = !post-review --guess-summary --guess-description
--username=kaning --parent=master --tracking-branch=origin/master
--target-groups=kmymoney
---
which se
Well, and to create the patchfile for the reviewboard I used:
$ git diff master >patch.diff
That creates a patch summary for all the changes I had made on my local branch
against master.
Am getting slowly into it…
;-)
___
KMyMoney-devel mailing list
Hi Alvaro & Cristian,
> git rebase master
I have done that successfully. Thanks for clarifying this one.
Since I still had outstanding changes in my branch checkout I learnt that
$ git stash
$ git rebase master
$ git stash pop
is the way to go.
GREAT!
Thanks guys!
Marko
You only pull from the remote while on master or in a branch that's
present in the remote. For your own branches, you rebase from master
(or stable, etc.)
So, the workflow would be like this:
git checkout featureX
(code, test, whatever)
git checkout master
git pull -r
git checkout featureX
git r
On Sunday 27 November 2011 13:13:42 Marko Käning wrote:
> Hi Alvaro,
>
> now that we are at it, I also have a question.
>
> What concerns DVCSs I am familiar with Mercurial, but not git.
>
> I ran into a similar situation like Allan, after having created my own
> branch yesterday I noticed that mas
Hi Alvaro,
now that we are at it, I also have a question.
What concerns DVCSs I am familiar with Mercurial, but not git.
I ran into a similar situation like Allan, after having created my own branch
yesterday I noticed that master proceeded. I could update my clone to master's
new tip by issui
Hello Allan,
check on the web that your commits are on origin/master.
Then, switch to master branch, and run this:
git fetch origin && git reset --hard origin/master
This will get the latest from remote master and reset your branch to it.
Of course, this will overwrite any changes you have made,
When now I do git checkout master, I get
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 2 commits.
Does this suggest something went amiss when I pushed the two commits
yesterday?
Allan
___
KMyMoney-devel mailing list
KMyMon
