zsh-users
 help / color / mirror / code / Atom feed
From: Peter Stephenson <p.w.stephenson@ntlworld.com>
To: Zsh Users <zsh-users@zsh.org>
Subject: Re: git along
Date: Thu, 13 Nov 2014 20:01:44 +0000	[thread overview]
Message-ID: <20141113200144.7510d6a8@pws-pc.ntlworld.com> (raw)
In-Reply-To: <546501D1.3050608@eastlink.ca>

On Thu, 13 Nov 2014 11:09:05 -0800
Ray Andrews <rayandrews@eastlink.ca> wrote:
> The 'git' manual being longer than War and Peace, let me ask
> some simple questions:
> 
>        git clone git:where-its-coming-from where-its-going-to
> 
> ... simple. If I rerun it with the same target dir, will it just
> update, or will it do the full monty all over again? Would any
> files I've added be preserved, or nuked?

Just change into where-its-going-to and

git pull

or if you're liable to have made changes to the repository yourself since you last updated

git pull --rebase

which puts your changes together with the remote ones together in a neater
fashion.

> Can we:
> 
>      git just-show-me-whats-changed ... ?
> 
> ... or is life just not meant to be so painless?

Do you mean what you just imported in the last pull?

git log ORIG_HEAD..

Add the option -p if you want to see changes within files as a patch.

(As you're about to see, any sufficiently complicated git post
instantly has half a dozen git experts falling over themselves to point
out the error of your ways.)

> Is there a recommended beginner's guide to git?

http://git-scm.com/book/en/v2

pws
 


  parent reply	other threads:[~2014-11-13 20:01 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-13 19:09 Ray Andrews
2014-11-13 18:44 ` Nathan Schwarz
2014-11-13 23:48   ` Ray Andrews
2014-11-13 19:20 ` Bart Schaefer
2014-11-13 20:01 ` Peter Stephenson [this message]
2014-11-14 17:31   ` Bernd Steinhauser

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=20141113200144.7510d6a8@pws-pc.ntlworld.com \
    --to=p.w.stephenson@ntlworld.com \
    --cc=zsh-users@zsh.org \
    /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.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).