Re: using git-difftool -d when cherry-picking

2016-04-30 Thread Jan Smets
On Sat, Apr 30, 2016 at 3:19 AM, David Aguilar wrote: > On Wed, Apr 27, 2016 at 11:12:25AM +0200, Jan Smets wrote: >> Hi >> >> Please consider following example >> >> #!/bin/bash >> rm -rf /tmp/gittest >> mkdir /tmp/gittest >> cd /tmp/gittest >> >> git init >> >> echo $RANDOM > testfile >> git add

Re: using git-difftool -d when cherry-picking

2016-04-29 Thread David Aguilar
On Wed, Apr 27, 2016 at 11:12:25AM +0200, Jan Smets wrote: > Hi > > Please consider following example > > #!/bin/bash > rm -rf /tmp/gittest > mkdir /tmp/gittest > cd /tmp/gittest > > git init > > echo $RANDOM > testfile > git add testfile > git commit -m test -a > > git branch X > git checkout

using git-difftool -d when cherry-picking

2016-04-27 Thread Jan Smets
Hi Please consider following example #!/bin/bash rm -rf /tmp/gittest mkdir /tmp/gittest cd /tmp/gittest git init echo $RANDOM > testfile git add testfile git commit -m test -a git branch X git checkout X echo $RANDOM > testfile git add testfile git commit -m test -a git checkout master echo $