Thanks guys! Very helpful information. Allowed me to be confident about
proceeding. Problem has been fixed and it went smoothly.
I am still not sure how the repo could have gotten in that state since I am
just about 100% positive there was no other push from anywhere. I will have
to investigate
Doing some research.
$ git reflog
6d86f4c HEAD@{0}: commit: Simplify configuration using RUBY_PATH. [major]
e6ca6f1 HEAD@{1}: commit: Step toward getting direct LEDGER references
out of Library.
7219018 HEAD@{2}: commit: Minor refactorings to Ledger class.
So I am thinking I just do:
Hi, I just screwed my repo and need advice on how to get it back.
I have been doing some major work on a project, and was finally ready to
push it. Foolish me did the work in master. So I go to push and I am told,
"To prevent you from loosing history non-fast-forward updates were
rejected...".
On Saturday, July 28, 2012 12:16:44 PM UTC-4, Antony Male wrote:
>
>
> Something like the following will work fine:
>
> First, create a new tag called at the same point as the branch
>
>
> git tag
>
Oh, so the branch and tag names won't conflict?
--
You received this message because
Might eat up a lot of space after a while. Plus how often is dropbox synced?
I'm not sure why you would want a local git repo in dropbox, since in this
case it is already "backed-up" on GitHub's servers.
--
You received this message because you are subscribed to the Google Groups "Git
for huma
Somehow I have branch that was supposed to be a tag. Not sure how it ever
became a branch, but now that I have discovered it I am wondering, how do I
convert the branch into a tag?
Since the name will be the same for both the branch and the tag, I assume I
can just checkout the branch and tag i
Heroku is your friend if you have the $.
On Friday, March 30, 2012 2:04:40 PM UTC-4, Yves S. Garret wrote:
>
> Hi,
>
>My organization has fallen in love with cloud computing (yay,
> progress, moving into the future!) What I would like to know is how I
> can combine the cloud and Git. I'd
Ok. That makes some sense.
--
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/-/JiwrQLfEtUYJ.
To post to this group, send email to git-users@googlegroups.co
Ah, good to know. Thanks.
--
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/-/9azpXq6M47sJ.
To post to this group, send email to git-users@googlegroups.com
I figured it out.
$ git reflog
Then
$ git checkout -b someName shaOfResetCommit
Thankfully git doesn't actually delete anything for some 90 days after the
fact.
My mistake was to use `--hard`, but I didn't think it would delete the
files b/c there were not being tracked before this parti
I just added the complete contents of a directory to my project, and
committed.
$ git add foo/
$ git commit -m "Add foo."
Then I realized that I actually did not want to add all those files. So I
tried to step back with:
$ git reset --hard HEAD^
Git rolled back the commit okay, but also
On Sunday, December 11, 2011 3:13:44 PM UTC-5, Konstantin Khomoutov wrote:
>
> "Patching" a tag sounds odd for a system which is about keeping immutable
> objects referencing each other by cryptographic hashes of their
> contents.
>
> Unfortunately, git-tag seems not to support anything like -c o
Yep. Thanks. I've read it. But it only speaks of creating missing tags. I
was wondering if there is a way to adjust the data of an existing tag.
I can of course delete the tag and retag --which is what I am doing
presently. Unfortunately that means checking out previous tag, copy tag
message, d
On some project's I've gone back a tagged things I had forgotten to tag
when I should have. While I thought all was peachy, I realized later that
the tag then have the wrong dates associated with them.
Is there any way to change the date of a tag other then to delete the tag
and retag it?
Than
Thanks. That's a good idea.
--
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/-/OHuvyjgV3Q8J.
To post to this group, send email to git-users@googlegroups.c
Never mind. As usual the problem was that I was not in the master branch.
I wish git would point out the current branch when these errors arise.
--
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
h
I simply don't understand:
$ git pull upstream master
From github.com:benbjohnson/smeagol
* branchmaster -> FETCH_HEAD
Already up-to-date.
$ git push upstream master
To git(at)github.com:benbjohnson/smeagol.git
! [rejected]master -> master (non-fast-forwa
On Jul 1, 1:53 pm, Konstantin Khomoutov wrote:
> On Jul 1, 8:00 pm, Trans wrote:
>
> > I tried to push my tags for the first time and an old tag is throwing
> > an error:
>
> > $ git push --tags
> > To g...@github.com:proutils/vclog.git
> > ! [re
I tried to push my tags for the first time and an old tag is throwing
an error:
$ git push --tags
To g...@github.com:proutils/vclog.git
! [rejected]1.4.0 -> 1.4.0 (non-fast forward)
error: failed to push some refs to 'g...@github.com:proutils/
vclog.git'
But my current tag is 1.7
On Jun 19, 1:46 pm, Peter Shenkin wrote:
> On Sat, Jun 19, 2010 at 1:24 PM, Trans wrote:
> > I'm not a bash expert, so I need to ask, who can I "pipe" a message
> > into the git tag command? I have a program that will return my latest
> > release notes
I'm not a bash expert, so I need to ask, who can I "pipe" a message
into the git tag command? I have a program that will return my latest
release notes.
$ pom news
... message ...
So I want to pipe that into git tag as the tag message. I've been
trying to figure it out. The docs say that ther
On Jun 7, 5:50 pm, Jacob Helwig wrote:
> On Mon, Jun 7, 2010 at 14:48, Trans wrote:
>
> > On Jun 7, 5:31 pm, Jacob Helwig wrote:
>
> >> You're probably best off reverting the commit(s) that brought in the
> >> changes you don't want, before merging
On Jun 7, 5:31 pm, Jacob Helwig wrote:
> You're probably best off reverting the commit(s) that brought in the
> changes you don't want, before merging in your changes. Your merge
> will then be able to go forward as though the other changes had never
> happened.
Ok thanks. So I should move my
Hi--
I am working on a project with another developer. He was having some
issues getting things working so he made some changes and pushed them
up to the master repo. However, his changes were the wrong way to go
about it. If only a couple of lines were affected I would just pull it
down and go fr
Sorry, make that:
$ git branch recentwork 8658a39
--
You received this message because you are subscribed to the Google Groups "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...@go
On Jun 1, 4:39 pm, Dan Preston wrote:
> You should be ok. You can use the "git reflog" command to view the
> history of what you've had checked out. You can then checkout the
> hash commit of your latest work again and create a branch from it. Or
> alternatively you can merge that hash back t
Looks like git just pissed away all my work for the last two months.
I was doing everything like I normally do. I made my changes,
committed and 'git push origin master'. Everything looked good. Git
told me "Everything up-to-date". But... I went over to the project's
github page (http://github.com
Okay this one is (perhaps) a little more challenging. The tag date is
the date the tag was created. But to me the tag date needs to be the
date of the last commit made upto that tag. Right now I extract the
date via:
$ tag show 1.0.0
Which gives me a header:
tag 1.0.0
Tagger: 7rans
Date
On May 26, 10:16 am, Paul Beckingham wrote:
> > I screwed up some tag messages and I need to go back and change them.
> > How does one do this?
>
> Delete the tag, and recreate it. It is, after all, just a synonym for a
> commit. Take a look at "git help tag".
Doh! Good idea! Lol :-)
--
Yo
Hi--
I screwed up some tag messages and I need to go back and change them.
How does one do this?
Thanks.
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe fr
On May 20, 4:10 am, David Aguilar wrote:
> Maybe not a huge deal, but you do lose the ability to do:
>
> % git describe --match='v*'
That's an interesting point. Although it precludes naming a tag
starting with the letter 'v' unless it is in fact a version. Is it not
possible to use a re
On May 7, 7:57 am, Konstantin Khomoutov wrote:
> On May 7, 12:51 am, Trans wrote:
>
> > I notice that almost every tagging example uses a version number with
> > a prefixed 'v', e.g.
>
> > $ tag -a -m "first major point release" v1.0.0
>
>
I notice that almost every tagging example uses a version number with
a prefixed 'v', e.g.
$ tag -a -m "first major point release" v1.0.0
I, on the other hand, have never bothered with 'v' prefix, and have
always done, e.g.:
$ tag -a -m "first major point release" 1.0.0
Is there some reason
On Apr 28, 2:27 am, Marek Wywiał wrote:
> On 27 Kwi, 22:07, Trans wrote:
>
> > Perhaps someone can instruct me on the proper approach, I can't seem
> > to find any specific documentation on this.
>
> > I recently released a version of my project, for simplici
Perhaps someone can instruct me on the proper approach, I can't seem
to find any specific documentation on this.
I recently released a version of my project, for simplicity call it
1.0. Then I began work on version 2.0. I realize I should have created
a branch for it, but I didn't, I got a head of
Hi--
Can anyone here tell me of cases when they felt its was necessary to
re-tag a repo (with the same tag as had been used previously)?
Git allows this, though in the docs it clearly warns against it,
especially if you have pushed the tags. But it still does not forbid
it and even provides a way
On Feb 10, 5:13 pm, "FlashWebHost.com" wrote:
> Use hooks, here is what i use
>
> [fsh...@server58 hooks]$ cat post-update
> #!/bin/sh
> #
> # An example hook script to prepare a packed repository for use over
> # dumb transports.
> #
> # To enable this hook, rename this file to "post-update".
>
t permissions to use?
Thanks,
~Trans
--
You received this message because you are subscribed to the Google Groups "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...@googlegroup
Was reading: http://git.wiki.kernel.org/index.php/SubprojectSupport
Wouldn't a simple solution be to have a special super-project repo
type, such that all subdirectories are .git roots? (or I suppose it
could be recursive too, so all subdirectories are either .git roots or
themselves "super-roots"
On Jan 7, 1:22 am, David Aguilar wrote:
>
> 1. git remote add upstream git://github.com/upstream/project.git
> 2. git fetch upstream
> 3. git reset --hard upstream/master
> 4. git push origin +master
>
> 1. Add a reference to the repo you forked from
> 2. Fetch its branches
> 3. Reset your curre
On Jan 6, 10:51 am, "Michael P. Soulier"
wrote:
> On 06/01/10 Trans said:
>
> > I am using github. So I have my own fork. So it's more involved then
> > that. I would have to delete my fork, then refork it and then reclone
> > it. I was hoping for a simp
On Jan 6, 12:12 pm, Konstantin Khomoutov wrote:
> I've just forked my friend's project on github, checked it out,
> and it seems that the forked repo is not really tied to the repo
> it was forked off: there's just one remote, "origin", which is
> my forked repo.
> So I think you have two ways
On Jan 6, 9:20 am, "Michael P. Soulier"
wrote:
> On 05/01/10 Trans said:
>
> > So I've cloned a repo, which is a fork of another repo. If I want to
> > update my repo to match the original (and ditch any changes I may have
> > made), how do I do it?
>
So I've cloned a repo, which is a fork of another repo. If I want to
update my repo to match the original (and ditch any changes I may have
made), how do I do it?
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send
On Jan 1, 7:43 pm, Jeffrey wrote:
> This sounds like precisely the purpose of standard formats for log
> messages. The simplest thing would be to prefix the subject with
> "[type]:" like this:
>
> major: add big feature
>
>
>
> or put it on the first line of the body, if you have something
Is there are way to add a custom property to commits? I want to use it
to track commit "type" For example, I use 'admin', 'doc', 'major',
'minor', and 'bug' to classify my commits.
Thanks.
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
Can any git experts here conceive of a way to have "git in git"?
I want to keep a git history for each subproject, but at the same time
keep all the subprojects wrapped up in a single repo. I was trying
something like:
myproject/
.git/
subproj1/
.git/
...
subproj2/
On Apr 16, 10:10 am, gitster wrote:
> On Apr 15, 11:45 pm, Broc wrote:
>
> > it goes out to both repos instead of having to do:
> > $ git push
> > $ git push assembla
>
> > I've read in the docs that you can add the remote as a mirror using --
> > mirror, but AFAIK this is only for new repo
48 matches
Mail list logo
