to 0 or more parent commits.
What git doesn't do is track files OR directories directly by name.
--
Rick DeNatale
Blog: http://talklikeaduck.denhaven2.com/
Twitter: http://twitter.com/RickDeNatale
WWR: http://www.workingwithrails.com/person/9021-rick-denatale
LinkedIn: http://www.linkedin.c
ars to be something I did locally.
Not sure what to make of this.
HTH
--
Rick DeNatale
Blog: http://talklikeaduck.denhaven2.com/
Twitter: http://twitter.com/RickDeNatale
WWR: http://www.workingwithrails.com/person/9021-rick-denatale
LinkedIn: http://www.linkedin.com/in/rickdenatale
--~--~
ches ancestor(s).
See the man page for git-push in the section on fast forwards.
--
Rick DeNatale
Blog: http://talklikeaduck.denhaven2.com/
Twitter: http://twitter.com/RickDeNatale
WWR: http://www.workingwithrails.com/person/9021-rick-denatale
Linked
On Sun, Sep 6, 2009 at 10:05 AM, Michael P.
Soulier wrote:
> On 02/09/09 Rick DeNatale said:
>
>> Just push the branch as in
>>
>> git push remote my_branch
>>
>> Now you might run into an issue of master (or an ancestor branch of
>> your branch) has
gt; It seems my commit of add file_1 is disappeared.
> Can I find it?
It should be on the branch
git checkout branch_1
and the file should be in your working set.
Now if you want to merge the changes back to master:
git checkout master
git merge branch_1
--
Rick DeNatale
Blog: http://
rom one remote before git push --mirror to another?
--
Rick DeNatale
Blog: http://talklikeaduck.denhaven2.com/
Twitter: http://twitter.com/RickDeNatale
WWR: http://www.workingwithrails.com/person/9021-rick-denatale
LinkedIn: http://www.linkedin.com/in/rickdenatale
--~--~-~--~~---
oint I might want to get back to, such as the commit
corresponding to a current release, the I tag it and push the tag.
--
Rick DeNatale
Blog: http://talklikeaduck.denhaven2.com/
Twitter: http://twitter.com/RickDeNatale
WWR: http://www.workingwithrails.com/person/9021-rick-denatale
LinkedIn: http:/
On Fri, Nov 27, 2009 at 1:58 PM, Konstantin Khomoutov
wrote:
> On Nov 27, 9:51 pm, Rick DeNatale wrote:
>
>>>> Some branches in git are tracking another branches (for example,
>>>> usually master tracks origin/master). Let's assume, that in my work-
>>&g
. Wikipedia uses a complex
relational database to save wiki pages and provide version control.
Building a wiki on git would seem to be a fairly natural idea, but I
don't think that the interface between the app and git would look like
a relational db api.
--
Rick DeNatale
Blog: http://talk
;> Jeffrey
>
> Yes. That is what I currently do. It works okay, but I would prefer
> something more formal/strict if possible. It's very easy to fail to
> conform to a log message convention.
Well if you HAVE to be formal/strict you might want to look at the
p
can do. Look into using Puppet. You
> can use git to manage the Puppet manifests.
Another option, which most of the cool kids I know seem to be using
these days is Chef
http://wiki.opscode.com/display/chef/Home
--
Rick DeNatale
Blog: http://talklikeaduck.denhaven2.com/
Twitter: http://twitter
On Tue, Mar 16, 2010 at 3:19 AM, vfclists wrote:
>
> Is there a git command to compare a file in your working directory
> against the same file in a branch or a particular commit?
>
git diff example_branch -- path/to/file
git diff cf3b3fd -- path/to/file
--
Rick DeNatale
ps
> "Git for human beings" group.
> To post to this group, send email to git-us...@googlegroups.com.
> To unsubscribe from this group, send email to
> git-users+unsubscr...@googlegroups.com.
> For more options, visit this group at
> http://groups.google.com/group
On Wed, Mar 31, 2010 at 12:11 PM, vfclists wrote:
>
>
> On Mar 31, 4:20 pm, Rick DeNatale wrote:
>> Is this what you are looking for?
>>
>> http://www.gitready.com/beginner/2009/01/19/ignoring-files.html
>>
>>
>
>
> Using .gitignore is something I
On Wed, Mar 31, 2010 at 2:08 PM, vfclists wrote:
>
>
> On Mar 31, 6:03 pm, Rick DeNatale wrote:
>> On Wed, Mar 31, 2010 at 12:11 PM, vfclists wrote:
>>
>> > On Mar 31, 4:20 pm, Rick DeNatale wrote:
>> >> Is this what you are looking for?
>>
"
> git checkout master
> git pull
> git branch B-continued
> git checkout B-continued
> git merge B
> git branch -d B
> -- Continue working on B-continued--
If I understand what you are asking I think it's just
- Starting on Branch B
git commit -m'B work in pr
On Thu, Apr 15, 2010 at 6:45 PM, Charles Manning
wrote:
> On Friday 16 April 2010 01:15:42 Rick DeNatale wrote:
>> On Thu, Apr 15, 2010 at 12:59 AM, Charles Manning
>>
>> wrote:
>> > Hi All
>> >
>> > I have an issue that I think I can resolve in a
com/search?q=capistrano+deploy+php
Having a separate staging server for each developer seems to be
overkill to me, most of the projects I've worked on have the
developers run code on their own development machines, and one staging
server where code not ready for production can be deployed for manua
ary.
In most of my projects this happens constantly, not just once per day.
What difference does it make if that deploy does a checkout/pull from
a repo rather than pushing to a non-bare repo on the server?
>
> Sorry, I'm very new to git, so I'm just trying to figure out the
advocates using git pull --rebase, rather than letting git pull use
the default of merging instead of rebasing.
Is this good advice?
--
Rick DeNatale
Blog: http://talklikeaduck.denhaven2.com/
Github: http://github.com/rubyredrick
Twitter: @RickDeNatale
WWR: http://www.workingwithrails.com/person
s a HEAD for each branch, it points to the commit at
the tip of that branch.
The command git reset changes which commit HEAD points to for the
current branch.
--
Rick DeNatale
Blog: http://talklikeaduck.denhaven2.com/
Github: http://github.com/rubyredrick
Twitter: @RickDeNatale
WWR: http://www.workin
re optional)
There may be more efficient ways to do this. I use the grb ruby gem to
handle tasks like this and this is how it approaches renaming a remote
branch.
--
Rick DeNatale
Blog: http://talklikeaduck.denhaven2.com/
Github: http://github.com/rubyredrick
Twitter: @RickDeNatale
WWR: http://w
rmat.
ls -1 .git/refs/heads
Note that it's dash one, not dash ell
--
Rick DeNatale
Blog: http://talklikeaduck.denhaven2.com/
Github: http://github.com/rubyredrick
Twitter: @RickDeNatale
WWR: http://www.workingwithrails.com/person/9021-rick-denatale
LinkedIn: http://www.linkedin.com/in/ric
HA. In this case git doesn't know what branch you are
on, in fact that commit may appear on more than one branch or no
branch at all.
--
Rick DeNatale
Blog: http://talklikeaduck.denhaven2.com/
Github: http://github.com/rubyredrick
Twitter: @RickDeNatale
WWR: http://www.workingwithrails.com/
quot;.
Actually .git/HEAD is exactly where git stores the notion of the "curent branch"
if it contains something like
ref: refs/heads/master
Then the current branch is master
If it just contains a sha then HEAD is detached and there IS no current branch.
Which was my
information for professionals.
Which was no doubt achieved by spamming new-groups with irrelevant posts.
--
Rick DeNatale
Blog: http://talklikeaduck.denhaven2.com/
Github: http://github.com/rubyredrick
Twitter: @RickDeNatale
WWR: http://www.workingwithrails.com/person/9021-rick-denatal
uot;Git for human beings" group.
> To post to this group, send email to git-users@googlegroups.com.
> To unsubscribe from this group, send email to
> git-users+unsubscr...@googlegroups.com.
> For more options, visit this group at
> http://groups.google.com/group/git-users?hl=e
y (linear here to simplify, with parents to the left
and children to the right
a(v0.1) b c d(v1.1) e
Then git tag --contains x
will return v0.1 AND v1.1 if x is d or e
and v0.1 if x is any of a, b, or c.
Note that not ever commit has a tag.
--
Rick DeNatale
Google+: +Rick DeNatale <htt
branch is
really just in effect a variable pointer to a commit.
http://www.scribd.com/doc/65739673/12/The-Treeish#outer_page_41 et. seq.
(see page 42)
--
Rick DeNatale
Google+: +Rick DeNatale <https://plus.google.com/10254117893106790>
Blog: http://talklikeaduck.denhaven2.com/
Github: ht
the new branch(5)
Next we tell the new branch to merge changes to the right branch on origin
(6) Note this remote branch won't exist yet.
Finally we checkout the new local branch(7) and push it to the remote repo.
--
Rick DeNatale
Google+: +Rick DeNatale <https://plus.google.com/
e branch name, ie: git push origin branch_name.
>
>
The problem is he said that he already made 12 commits to master in his
local repo. So that stash will only save any uncommitted changes since the
last commit.
I believe that my suggestion will leave him in the same state as if he ha
etched master from remote then he made some
changes, commited locally, and repeated 11 more times.
Now he realizes that before making those changes he should have created a
new branch.
> 10-09-2012 14:14, "Rick DeNatale" napisał(a):
>
>>
>> On Mon, Sep 10, 2012 at 7:2
;
> --
> Łukasz Siwiński
> http://siwinski.info
>
> Wysłano z telefonu.
> 10-09-2012 17:22, "Rick DeNatale" napisał(a):
>
> On Mon, Sep 10, 2012 at 8:55 AM, Łukasz Siwiński wrote:
>>
>>> Hmm...
>>>
>>> > Local Repo 12 commits
git checkout B -- somefile
On Mon, Dec 17, 2012 at 7:58 AM, lei yang wrote:
> Hi expert,
>
> now I'm in the branch A, I want to copy some file from branch B to A
>
> any help?
>
> Lei
>
> --
>
>
>
--
Rick DeNatale
Google+: +Rick DeNatale <https:/
34 matches
Mail list logo
