From: "David Jeske" <jeske@willowmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Theodore Tso" <tytso@mit.edu>, git@vger.kernel.org
Subject: Re: policy and mechanism for less-connected clients
Date: Wed, 25 Jun 2008 23:03:02 -0000 [thread overview]
Message-ID: <willow-jeske-01l6aDyTFEDjCfcn> (raw)
In-Reply-To: <7viqvxxix0.fsf@gitster.siamese.dyndns.org>
-- Junio C Hamano wrote:
> >> : "ncvs up" ->
> >> :
> >> : git stash; git pull; git apply;
>
> First of all, if you are in CVS mindset, you may not want to necessarily
> do "git pull", but "git fetch" followed by "git rebase".
I don't want to replicate CVS behavior, just the workflow. I've considered
rebase, but the diagrams on the documentation page look scarry. I want to keep
the dag-nodes made by their local git commit;. At those commits the code worked
and tested in their tree. rebase looks like it tosses those dag-nodes when it
rewrites the diffs -- who knows if the tests actually pass for every point
along that new rebase. That's no good.
I can see the use of rebase when your job is to "author an understandable
public source tree", but I'm working on SCM, where the goal is to be able to
reproduce the state of past successes reliably.
I want someone to be able to checkout what was actually in the user's local
client as they were working. Which means I think I want "fetch and merge" which
is pull. Did I get that wrong?
> I suspect the last one in the above sequence of yours is "git stash pop".
> Definitely not "git apply" without any argument which is a no-op.
I meant to type "git stash apply", but I think you're right, pop is what I
wanted.
> >> : git diff --stat <baseof:current branch> - un-pushed filenames
>
> "git diff [--options] origin..." (three-dots) is often used. This is a
> shorthand for:
>
> git diff [--options] $(git merge-base origin HEAD) HEAD
>
> that is, "show me what I did since I forked from origin".
I'm still a little foggy on the remote referenecs, but remember I have two
remotes (shared) and (personal). Something in the docs led me to believe
'origin' was repository wide, not private to each branch. Is "origin" a magic
name for the current branch's target?
> >> : git-show-branch <current branch> - un-pushed comments
>
> This would be useful if you are using "fetch + rebase", but in any case
>
> git log --graph --pretty=oneline origin..
Ahh, yes, Thanks!. How does this interact with the "pull" I just did?
What I want is "show me the commit messages (and sha1 keys) for changes in my
local branch that are not yet submitted to it's remote tracking location"
Will that command above include the commit lines that came down in my pull
(fetch/merge)? If so, how do I not include them?
> > Question: How do I create a branch on a remote repo when I'm on
> > my local machine, without sshing to it?
>
> I hope that the question is not "How do I do anything on a remote without
> having any network connection to it" as its answer cannot be anything but
> "telepathy".
Funny. I'm asking how I can run a command locally, that during the next "git
push HEAD" will cause a branch to be created on a remote repository, without
assuming that is the same repository that my current branch is pointing to.
Will this do the trick?
git branch --track mynewbranch git://myserver/path/foo.git
# hack hack
git commit
git push HEAD
- David
next prev parent reply other threads:[~2008-06-25 23:06 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <willow-jeske-01l6@3PlFEDjCVAh-01l6OB5yFEDjCYe3>
2008-06-25 13:34 ` policy and mechanism for less-connected clients Theodore Tso
2008-06-25 17:34 ` Junio C Hamano
2008-06-25 19:37 ` David Jeske
2008-06-25 21:34 ` David Jeske
2008-06-25 22:10 ` Jakub Narebski
2008-06-25 22:13 ` Junio C Hamano
2008-06-25 23:03 ` David Jeske
2008-06-25 23:03 ` David Jeske [this message]
2008-06-25 21:34 ` David Jeske
2008-06-25 19:37 ` David Jeske
2008-06-25 20:52 ` Jakub Narebski
2008-06-25 20:54 ` Jakub Narebski
[not found] <willow-jeske-01l6@3PlFEDjCVAh-01l6rSE7FEDjCYv6>
2008-06-26 11:37 ` Theodore Tso
2008-06-26 16:21 ` David Jeske
2008-06-26 16:21 ` David Jeske
[not found] <willow-jeske-01l6@3PlFEDjCVAh-01l6it3ZFEDjCd5X>
2008-06-26 5:23 ` Theodore Tso
2008-06-26 5:26 ` Junio C Hamano
2008-06-26 6:08 ` David Jeske
2008-06-26 6:08 ` David Jeske
2008-06-25 14:03 Petr Baudis
[not found] <willow-jeske-01l6@3PlFEDjCVAh-01l6@3N@FEDjCXZO>
2008-06-25 2:33 ` Theodore Tso
2008-06-25 5:20 ` David Jeske
2008-06-25 9:30 ` Jakub Narebski
2008-06-25 5:20 ` David Jeske
2008-06-25 19:17 ` Daniel Barkalow
2008-06-25 20:12 ` Raimund Bauer
-- strict thread matches above, loose matches on Subject: below --
2008-06-25 0:36 David Jeske
2008-06-25 0:36 David Jeske
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=willow-jeske-01l6aDyTFEDjCfcn \
--to=jeske@willowmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox