I regularly rebase and force-update pull request commits. GitHub even
notices when a commit is out of date and hides the comments, if
they're made there. So I encourage you to do this.
Sam
On Sat, Oct 19, 2013 at 10:56 PM, David T. Pierson d...@mindstory.com wrote:
Thank you to everyone who
A report from the junior varsity squad:
I just tried this on OS X and it worked AOK.
FWIW I've been strictly doing `git pull --ff-only upstream master` to
keep my fork's master 100% in sync with PLT's. Any experimentation or
feature requests done solely on topic branches. (Like I wrote about
On 2013-07-27 07:10:54 -0600, Matthew Flatt wrote:
I'm still unsure that submodules are going to be useful for managing a
kind of main-distribution repository with references to package
repositories.
Perhaps it would be worth considering using the git subtree feature
instead of submodules for
I looked into git-subtree, and as I recall it, nothing in the setup recalls
what subtree is used for what. Every git-subtree command you enter has to
be fully explicit, which is a big hassle. Whereas git-submodule saves its
state in the repository, so it knows what it's being used for and you
On 2013-07-30 17:44:37 -0400, Carl Eastlund wrote:
I looked into git-subtree, and as I recall it, nothing in the setup
recalls what subtree is used for what. Every git-subtree command you
enter has to be fully explicit, which is a big hassle.
AFAIK, you are correct. OTOH, I imagine that
On 2013-07-31 00:04:20 -0400, Asumu Takikawa wrote:
Maybe I will try this with Typed Racket somewhere and see what happens.
One downside I discovered immediately after trying to set this up:
the subtree command is only available in git 1.7.11 and newer and it's
only available if the contrib
I've just pushed a fix for the runtime error at the beginning there, but
I'll note that this part:
raco setup: WARNING: undefined tag in teachpack/teachpack.scrbl:
raco setup: (tech worldstate)
raco setup: (tech s expression)
raco setup: (tech package)
has been on your list for more than
Sorry! I've pushed a change.
On Thu, Nov 15, 2012 at 12:08 PM, Matthias Felleisen
matth...@ccs.neu.edu wrote:
Looks like the latest git head i smissing a file:
raco setup: --- installing collections ---
raco setup: --- post-installing collections ---
raco setup: post-installing: help
raco
On 04/25/2011 10:32 AM, Robby Findler wrote:
Anyone recognize this? (git up is git pull --ff-only --stat --all)
C:\Users\Administrator\git\exp\pltgit up
Fetching origin
error: unable to resolve reference refs/remotes/origin/master: No error
From git:plt
! [new branch] master -
Thanks! (I don't know why, but I'm just getting this message now.)
Robby
On Sun, May 1, 2011 at 2:04 AM, D Herring dherr...@tentpost.com wrote:
On 04/25/2011 10:32 AM, Robby Findler wrote:
Anyone recognize this? (git up is git pull --ff-only --stat --all)
Four hours ago, Robby Findler wrote:
Anyone recognize this? (git up is git pull --ff-only --stat --all)
C:\Users\Administrator\git\exp\pltgit up
Fetching origin
error: unable to resolve reference refs/remotes/origin/master: No error
From git:plt
! [new branch] master -
I ended up just doing a git clone to get a new copy and that worked
fine. I also was able to update some other copy I had.
Mysterious. I'll just throw the tree away now.
Robby
On Mon, Apr 25, 2011 at 1:08 PM, Eli Barzilay e...@barzilay.org wrote:
Four hours ago, Robby Findler wrote:
Anyone
Another question: what if I commit something just for the purpose of
moving to another machine and I don't want that commit to show up in
the main repository? Is that possible? (My tree is currently in that
state; it is one commit ahead of plt/master but that commit message is
a lie-- I've just
Can I do that once I've pushed to robby/plt? What happens to other
machines that have unsquashed versions of those commits?
Robby
On Fri, Jan 7, 2011 at 9:43 AM, Jay McCarthy jay.mccar...@gmail.com wrote:
I like to do an interactive rebase and squash commits together:
git rebase -i HEAD^^10
On Fri, Jan 7, 2011 at 10:42 AM, Robby Findler
ro...@eecs.northwestern.edu wrote:
Another question: what if I commit something just for the purpose of
moving to another machine and I don't want that commit to show up in
the main repository? Is that possible? (My tree is currently in that
That's what the force option for a rebasing fetch is for, to accept
overwriting the history on the machine. [For example, on Matthew's gr2
branch, he would regularly do this.]
Jay
2011/1/7 Robby Findler ro...@eecs.northwestern.edu:
Can I do that once I've pushed to robby/plt? What happens to
I like to do an interactive rebase and squash commits together:
git rebase -i HEAD^^10
where 10 is how many commits ahead of the master I am
Jay
2011/1/7 Robby Findler ro...@eecs.northwestern.edu:
Another question: what if I commit something just for the purpose of
moving to another machine
I think what I get from you and Jay is that it is possible to do, but
I guess I'm not completely clear on one particular usecase how it
would play out. (I understand that history rewriting is not allowed on
plt/master and that makes a lot of sense, etc.)
Lets say that, on my laptop I make 7
Okay, I tried an example of this and I'm getting stuck. I did one
commit and pushed on my laptop. On the desktop, I did another commit
and then I used an interactive rebase to swap the order of the
commits. Then, I did a push --force, which I think I understand and I
think worked.
Then, on the
On Jan 7, 2011, at 12:29 PM, Robby Findler wrote:
Then, on the laptop, I did a git pull, and I ended up with the commits
back in the original order and a merge commit afterwards but I would
rather just have my state be like the server's was.
Then don't do git pull. That not only updates your
On Jan 7, 2011, at 12:43 PM, Stevie Strickland wrote:
On Jan 7, 2011, at 12:29 PM, Robby Findler wrote:
Then, on the laptop, I did a git pull, and I ended up with the commits
back in the original order and a merge commit afterwards but I would
rather just have my state be like the server's
On Jan 7, 2011, at 7:42 AM, Robby Findler wrote:
Another question: what if I commit something just for the purpose of
moving to another machine and I don't want that commit to show up in
the main repository? Is that possible? (My tree is currently in that
state; it is one commit ahead of
On Fri, Jan 7, 2011 at 1:39 PM, John Clements cleme...@brinckerhoff.org wrote:
On Jan 7, 2011, at 7:42 AM, Robby Findler wrote:
Another question: what if I commit something just for the purpose of
moving to another machine and I don't want that commit to show up in
the main repository? Is
At Fri, 7 Jan 2011 11:39:33 -0800,
John Clements wrote:
Taking a step back: is there really anything wrong with such commits? Given
that drdr and e-mail alerts are based on pushes rather than commits, it seems
not unreasonable to just let those be intermediate commits. I can see that
Yesterday, Carl Eastlund wrote:
First do a git fetch remote-name for that remote, or just git
remote update which fetches from all your remotes. Then git reset
--hard remote-name/master will clobber whatever you have and
replace it with the remote's master branch.
Note that this changes
Yesterday, Robby Findler wrote:
So I did this (git means git.racket-lang.org in my ssh setup as
I did things that way before Eli's recommendation changed)
git clone git:robby/plt
git remote add plt git:plt
It might be more convenient to flip it -- clone git:plt first, and
then add a
On Jan 7, 2011, at 3:43 PM, Eli Barzilay wrote:
Yesterday, Robby Findler wrote:
So I did this (git means git.racket-lang.org in my ssh setup as
I did things that way before Eli's recommendation changed)
git clone git:robby/plt
git remote add plt git:plt
It might be more convenient to
Yesterday, Carl Eastlund wrote:
What you want to do is run gitk and/or git log on origin/master,
which is where those 53 show up.
A useful bit here -- you can pass `--all' to gitk which will make it
show all branches and tags.
--
((lambda (x) (x x)) (lambda (x) (x x)))
5 hours ago, Robby Findler wrote:
Another question: what if I commit something just for the purpose of
moving to another machine and I don't want that commit to show up in
the main repository? Is that possible? (My tree is currently in that
state; it is one commit ahead of plt/master but that
On Fri, Jan 7, 2011 at 3:00 PM, Eli Barzilay e...@barzilay.org wrote:
5 minutes ago, Stevie Strickland wrote:
On Jan 7, 2011, at 3:43 PM, Eli Barzilay wrote:
Yesterday, Robby Findler wrote:
So I did this (git means git.racket-lang.org in my ssh setup as
I did things that way before Eli's
Four hours ago, Stevie Strickland wrote:
On Jan 7, 2011, at 12:29 PM, Robby Findler wrote:
Then, on the laptop, I did a git pull, and I ended up with the
commits back in the original order and a merge commit afterwards
but I would rather just have my state be like the server's was.
Then
Four hours ago, Stevie Strickland wrote:
In general, this is why people say you really shouldn't train
yourself to do git pull automatically, because there's plenty of
places where you don't want that. I always do git remote
update/git merge ... separately because there's plenty of times
Two hours ago, John Clements wrote:
Taking a step back: is there really anything wrong with such
commits?
What Robby and Vincent generalizes too -- merging can be confusing
sometimes, either to the author or to the others; and there are a
bunch of tools that become less useful if the history
I'm surprised no one has linked this all-clarifying blog post :)
http://tartley.com/?p=1267
On Fri, Jan 7, 2011 at 4:52 PM, Eli Barzilay e...@barzilay.org wrote:
Two hours ago, John Clements wrote:
Taking a step back: is there really anything wrong with such
commits?
What Robby and
Four hours ago, Stephen Bloch wrote:
On Jan 5, 2011, at 8:10 PM, Robby Findler ro...@eecs.northwestern.edu wrote:
I'd like to move from one machine to another without pushing to
the main repo. I know one way to do that is to use my own copy but
it also seems like I should be able to
On Wed, 05 Jan 2011 23:14:58 -0600
Stephen Bloch sbl...@adelphi.edu wrote:
On Jan 5, 2011, at 8:10 PM, Robby Findler ro...@eecs.northwestern.edu wrote:
I'd like to move from one machine to another without pushing to the main
repo. I know one way to do that is to use my own copy but it
Three minutes ago, Stefan Schmiedl wrote:
Assuming that you have your changes committed to the repository on
machine A, you could run the following on B:
git clone m...@a:repo-path
This should get you the contents of A onto B and also configure B to
use A as origin, so that a git
On Thu, 6 Jan 2011 04:43:12 -0500
Eli Barzilay e...@barzilay.org wrote:
Actually, assuming that Robby wants to push from either place to the
main repository, having the default be the local one is something that
will be easy to trip over.
I assumed the alternative, since Robby wrote:
I'd
Thanks guys for the explanations. I'll study them -- I think I'm
missing some (probably simple) key piece of how git works internally
that would probably make this all obvious; hopefully these examples
will help me figure out what that piece is(!).
When I wrote main repo, of course, I meant the
Robby,
In case this helps, I maintain a repository cce/plt separate from
the regular plt one. I keep it at whatever version I last found to
work with my planet packages, etc., so I only have to update at my own
pace, as well as my own branches for tinkering with the trunk. That
way my state is
On Thu, Jan 6, 2011 at 8:35 AM, Robby Findler
ro...@eecs.northwestern.edu wrote:
Thanks, Carl. I have tried that route in the past and I found that I
let robby/plt get too far out of sync with the tree. So I'm looking
for a workflow where, perhaps, what I do is create robby/plt only when
I
On Thu, Jan 6, 2011 at 7:41 AM, Carl Eastlund c...@ccs.neu.edu wrote:
On Thu, Jan 6, 2011 at 8:35 AM, Robby Findler
ro...@eecs.northwestern.edu wrote:
Thanks, Carl. I have tried that route in the past and I found that I
let robby/plt get too far out of sync with the tree. So I'm looking
for a
On Thu, Jan 6, 2011 at 8:45 AM, Robby Findler
ro...@eecs.northwestern.edu wrote:
On Thu, Jan 6, 2011 at 7:41 AM, Carl Eastlund c...@ccs.neu.edu wrote:
You can always just leave robby/plt around, but only use it for that
purpose. Even if you've left it in some odd state, at any point in
time
On Thu, Jan 6, 2011 at 12:06 PM, Robby Findler
ro...@eecs.northwestern.edu wrote:
On Thu, Jan 6, 2011 at 8:00 AM, Carl Eastlund c...@ccs.neu.edu wrote:
In case you find it to be an improved workflow, here's what I do: I
maintain cce/plt as a clone of plt. I work on it, on whatever branch.
On Thu, Jan 6, 2011 at 11:22 AM, Carl Eastlund c...@ccs.neu.edu wrote:
It looks like you had 53 commits that were pushed to plt/master in a
slightly modified form -- probably you had them locally, rebased a few
commits from plt/master, then pushed them, and robby/plt never got
updated to
On Thu, Jan 6, 2011 at 12:25 PM, Carl Eastlund c...@ccs.neu.edu wrote:
On Thu, Jan 6, 2011 at 12:37 PM, Robby Findler
ro...@eecs.northwestern.edu wrote:
On Thu, Jan 6, 2011 at 11:22 AM, Carl Eastlund c...@ccs.neu.edu wrote:
It looks like you had 53 commits that were pushed to plt/master in a
On Thu, Jan 6, 2011 at 1:29 PM, Robby Findler
ro...@eecs.northwestern.edu wrote:
If your goal is to figure out this git stuff, I'm happy to keep
answering questions. If your goal is, more immediately, to figure out
if you need those 53 commits, open up read permissions to robby/plt
and I (or
On Thu, Jan 6, 2011 at 12:34 PM, Carl Eastlund c...@ccs.neu.edu wrote:
On Thu, Jan 6, 2011 at 1:29 PM, Robby Findler
ro...@eecs.northwestern.edu wrote:
If your goal is to figure out this git stuff, I'm happy to keep
answering questions. If your goal is, more immediately, to figure out
if
Yep, Eli's git overview had the answer, I think. I did RW @all.
Robby
On Thu, Jan 6, 2011 at 12:50 PM, Carl Eastlund c...@ccs.neu.edu wrote:
On Thu, Jan 6, 2011 at 1:44 PM, Robby Findler
ro...@eecs.northwestern.edu wrote:
On Thu, Jan 6, 2011 at 12:34 PM, Carl Eastlund c...@ccs.neu.edu wrote:
It's so reassuring to know that I'm not the only one floundering with git
:-)
Stephen Bloch
sbl...@adelphi.edu
_
For list-related administrative tasks:
http://lists.racket-lang.org/listinfo/dev
Thanks, Carl! I think I got it!
My main missing piece was understanding what remotes tags really are
and your messages plus a brush up on the
git-for-people-who-are-not-afraid-of-dags made all the difference in
the world.
Robby
_
For
+1
The learning curve isn't great, but the more I learn about git the
more I like it.
N.
On Wed, Jan 5, 2011 at 8:25 PM, Jay McCarthy jay.mccar...@gmail.com wrote:
Me too! Git is great now.
Jay
2011/1/5 Carl Eastlund c...@ccs.neu.edu:
Thanks to everyone whose efforts and patience helped
I too am quite happy we've switched. Thanks all. And Matthew, not too
long ago, showed me git rebase -i origin which, combined with git
commit --amend has really helped out my workflow.
So.. I have a question. I'd like to move from one machine to another
without pushing to the main repo. I know
53 matches
Mail list logo