zsh-users
 help / color / mirror / code / Atom feed
From: Bart Schaefer <schaefer@brasslantern.com>
To: Nathan Schwarz <nathan@notwhite.ro>, zsh-users@zsh.org
Subject: Re: git adventures
Date: Fri, 14 Nov 2014 15:40:20 -0800	[thread overview]
Message-ID: <141114154020.ZM6442@torch.brasslantern.com> (raw)
In-Reply-To: <20141114164658.GA6418@Persephone>

On Nov 14,  5:46pm, Nathan Schwarz wrote:
}
} > I'VE LEARNED ABOUT 'stage', BUT WHAT IS 'stash'?
} > HOW DO I commit/stash/stage THAT ONE FILE SO AS TO PROCEED? CAN WE TELL GIT
} > TO JUST NOT WORRY ABOUT THAT FILE--LEAVE IT BE, BUT PULL EVERYTHING ELSE?
} > THAT CHANGED FILE IS OBVIOUSLY ONLY OF TEMPORARY VALUE.
} `git stash $file` stashes changes as another form than a commit.

Hmm, "git stash $file" doesn't work for me -- it wants a keyword such as
"save" in the location where you have $file, and the only way to stash
selectively is with "git stash save --patch".  I don't see any mention
of stash accepting a file name in "man git-stash".


  parent reply	other threads:[~2014-11-14 23:40 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-14 17:39 Ray Andrews
2014-11-14 16:46 ` Nathan Schwarz
2014-11-14 16:51   ` Nathan Schwarz
2014-11-14 19:55   ` Ray Andrews
2014-11-14 23:40   ` Bart Schaefer [this message]
2014-11-15  0:17     ` Nathan Schwarz

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=141114154020.ZM6442@torch.brasslantern.com \
    --to=schaefer@brasslantern.com \
    --cc=nathan@notwhite.ro \
    --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).