Hi,
On Thu, 4 Sep 2008, Till Rettig wrote:
> Johannes Schindelin schrieb:
> > You mean "git reset --hard"? That resets _all_ files. _And_ the
> > staging area.
>
> Guess I meant that one -- I had sometimes problems with wrong commits
> that I didn't get reset somehow. As I understand, if I do
Johannes Schindelin schrieb:
Hi,
On Thu, 4 Sep 2008, till Rettig wrote:
- -) "git checkout filename" -- discards all non-committed changes to the
file.
I thought that works only if you remove the file before?
No, it works also with dirty files, i.e. files that have been mo
Hi,
On Thu, 4 Sep 2008, till Rettig wrote:
> > - -) "git checkout filename" -- discards all non-committed changes to the
> > file.
>
> I thought that works only if you remove the file before?
No, it works also with dirty files, i.e. files that have been modified,
but not committed.
The only
Original Message -
From: "Reinhold Kainhofer" <[EMAIL PROTECTED]>
To: "Jean-Charles Malahieude" <[EMAIL PROTECTED]>
Cc: "lilypond-devel"
Sent: Thursday, September 04, 2008 12:08 AM
Subject: Re: git uncleaned history
-BEGIN PGP SIGNED MESSAGE--
lilypond-devel
> Betreff: Re: git uncleaned history
>
> - -) "git checkout filename" -- discards all non-committed changes to the
> file.
I thought that works only if you remove the file before? At least that's how
I did it until now: rm filename and then git che
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Am Mittwoch, 3. September 2008 schrieb Jean-Charles Malahieude:
> I do all my "traffic" (translating and building) in Traduc, where I do a
> "git pull" quite often as you have noticed. Once I'm ready, I do:
>
> cd ..
> git branch (to be sure I'm on the
On 2008/09/03 21:07 +0200, Jean-Charles Malahieude wrote:
> Truly sorry to admit I have polluted the history tree again.
We already discussed this kind of issue, but obvisously not clearly
enough.
> ~/GIT/Lily/---(branches master and lilypond/translation)
> |
>
Hi Reinhold,
Truly sorry to admit I have polluted the history tree again.
Here is my tree
~/GIT/Lily/---(branches master and lilypond/translation)
|
---Mentors/---(my clone of the master branch)
|
---Traduc/(my clone of the lp/tran
