I have tried git diff master... which also have this issue, the
cherry-picked change is showing in the output.
2012/8/28 Fred
>
>
> On Tuesday, August 28, 2012 3:26:15 PM UTC+2, Michael Wang wrote:
>>
>> try git rev-list, following is an exmaple:
>>
>> loveky@LOVEKY-PC ~/test/test (dev)
>> $ g
Have any of you utilized GIT for an ERP package like PeopleSoft? ERP
systems tend to store their objects in a proprietary system without API's.
All of PeopleSoft's objects are contained as blob/text rows in its database.
Thank you for your assistance
--
You received this message because you
I'm following the following guide:
http://vim.wikia.com/wiki/A_better_Vimdiff_Git_mergetool#Comments
which uses a bash script as the mergetool that essentially calls vimdiff.
After adding the script as my mergetool and then running git mergetool to
resolve a conflict, I was faced with this erro
Lol. Yea, that's a good point.
On Aug 28, 2012 3:11 PM, "Adam Prescott" wrote:
> On Aug 28, 2012 8:51 PM, "Ryan Hodson" wrote:
> >
> > Or, you can use the -b shortcut to save a step:
> >
> > git checkout develop
> > git checkout -b some-feature
> >
>
> If you're going to use a shortcut, use a sh
Yes, I think that's what I need. Thank you.
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To view this discussion on the web visit
https://groups.google.com/d/msg/git-users/-/x9zAkLPTkvMJ.
To post to this group, send email to git-us
On Aug 28, 2012 8:51 PM, "Ryan Hodson" wrote:
>
> Or, you can use the -b shortcut to save a step:
>
> git checkout develop
> git checkout -b some-feature
>
If you're going to use a shortcut, use a shortcut!
git checkout -b some-feature develop
--
You received this message because you are subsc
Hi there. The parent branch will always be the *current* branch, so all you
need to do is:
git checkout develop
git branch some-feature
git checkout some-feature
Or, you can use the -b shortcut to save a step:
git checkout develop
git checkout -b some-feature
In either case, some-feature will h
For a more complicated development environment where there is a master
branch, a devel branch off of master, and feature branches off of devel,
how do you create a feature branch so that it's parent is the devel branch
and not the master branch?
Thanks!
--
You received this message because y
On Tuesday, August 28, 2012 5:13:39 PM UTC+2, donnoman wrote:
>
> git diff master..
>
> Would give you what's in your current branch since master
>
> git diff ..master
>
> Would show you commits in master that your local branch doesn't have
>
> git diff ...master
>
> Or
>
> git diff master.
git diff master..
Would give you what's in your current branch since master
git diff ..master
Would show you commits in master that your local branch doesn't have
git diff ...master
Or
git diff master...
Would show you all commits that your branch and master do not share
I only find the 3 d
On Tuesday, August 28, 2012 3:26:15 PM UTC+2, Michael Wang wrote:
>
> try git rev-list, following is an exmaple:
>
> loveky@LOVEKY-PC ~/test/test (dev)
> $ git log --oneline master
> 1874792 4
> 8ed7a1e 3
> a224756 2
> 34b4b11 1
>
> loveky@LOVEKY-PC ~/test/test (dev)
> $ git log --oneline dev
> f
Hi..
On Tue, Aug 28, 2012 at 6:02 PM, Fred wrote:
>
>
> On Tuesday, August 28, 2012 1:15:08 PM UTC+2, Tim Chase wrote:
>>
>> On 08/28/12 05:47, Tim Chase wrote:
>> > On 08/28/12 03:13, Fred wrote:
>> >> is there a way to check if a branch doesn't introduce changes,
>> >> which are not in master.
try git rev-list, following is an exmaple:
loveky@LOVEKY-PC ~/test/test (dev)
$ git log --oneline master
1874792 4
8ed7a1e 3
a224756 2
34b4b11 1
loveky@LOVEKY-PC ~/test/test (dev)
$ git log --oneline dev
fd0c922 5
a224756 2
34b4b11 1
loveky@LOVEKY-PC ~/test/test (dev)
$ git rev-list master..dev
On Tuesday, August 28, 2012 1:15:08 PM UTC+2, Tim Chase wrote:
>
> On 08/28/12 05:47, Tim Chase wrote:
> > On 08/28/12 03:13, Fred wrote:
> >> is there a way to check if a branch doesn't introduce changes,
> >> which are not in master.
> >
> > I'm partial to
> >
> > git diff my_branch ^m
On 08/28/12 05:47, Tim Chase wrote:
> On 08/28/12 03:13, Fred wrote:
>> is there a way to check if a branch doesn't introduce changes,
>> which are not in master.
>
> I'm partial to
>
> git diff my_branch ^master
>
> which would find all the changes on "my_branch" that aren't yet on
> master.
On 08/28/12 03:13, Fred wrote:
> is there a way to check if a branch doesn't introduce changes,
> which are not in master.
I'm partial to
git diff my_branch ^master
which would find all the changes on "my_branch" that aren't yet on
master. This is an open syntax so you can request "changes th
Hello,
is there a way to check if a branch doesn't introduce changes, which are
not in master.
I have production and master branches. If I would commit to production,
master would miss the changes. So I'd like to check if production differs
from master
Fred
--
You received this message becau
On Monday, August 27, 2012 5:54:26 PM UTC+2, Michael Haggerty wrote:
>
> On 08/27/2012 11:30 AM, Fred wrote:
> > I have two remote branches master and branchB.
> > I've merged master into branchB with git checkout branchB && git merge
> > master.
>
> o---o---o---o<- master
> \
18 matches
Mail list logo
