- Original Message -
From: André Hänsel
To: git-users@googlegroups.com
Sent: Monday, June 02, 2014 7:48 AM
Subject: [git-users] git reset with staged changes
I just learned painfully that git reset --hard deletes any previously
untracked files that have been staged. I had
I want to extend git commands set on per-repository basis and therefore I
need to have VERSIONED sort of .config file
You can use the repository's .git/config file to set repo-specific
configuration, but why would you want it to be versioned in the project
itself? It'd force anybody who
On Tue, Jun 03, 2014 at 04:24:43AM -0700, Pierre-François CLEMENT wrote:
I want to extend git commands set on per-repository basis and therefore I
need to have VERSIONED sort of .config file
You can use the repository's .git/config file to set repo-specific
configuration, but why
Sounds good enough. You could probably even embed it into a Makefile or a
Gruntfile or whatever-file you're using if you already have one. And about
the two-steps thing, you might want to get them to use a post-merge hook to
automate it.
--
You received this message because you are subscribed
On Tue, Jun 3, 2014 at 7:12 AM, Magnus Therning mag...@therning.org wrote:
On Tue, Jun 03, 2014 at 04:24:43AM -0700, Pierre-François CLEMENT wrote:
I want to extend git commands set on per-repository basis and
therefore I
need to have VERSIONED sort of .config file
You can use
On Tue, Jun 03, 2014 at 07:34:10AM -0500, John McKown wrote:
On Tue, Jun 3, 2014 at 7:12 AM, Magnus Therning mag...@therning.org wrote:
On Tue, Jun 03, 2014 at 04:24:43AM -0700, Pierre-François CLEMENT wrote:
I want to extend git commands set on per-repository basis and
therefore
From: André Hänsel an...@webkr.de
As usual I made sure that I had
no uncommited changes. There were only a few untracked files laying around
and my untracked (so I thought) but staged file, so I felt safe to reset. I
was expecting to see my migration file as untracked afterwards, ready to
2014-06-03 17:03 GMT+02:00 André Hänsel an...@webkr.de:
On Tuesday, June 3, 2014 2:16:44 PM UTC+2, Pierre-François CLEMENT wrote:
It seems logical to me that git-reset http://git-scm.com/docs/git-reset's
--hard option resets everything, what's staged, what's not, etc. I see it
as a *make my
From: Pierre-François CLEMENT lik...@gmail.com
Ah, my mistake I've misread you in the first place. You're right, it feels
natural they should return to their untracked state rather than being
deleted. And it sounds definitely possible to implement: git could just
check if the file was
