From: Torsten Bronger
To: git-users@googlegroups.com
Cc: philipoak...@iee.org
Sent: Wednesday, August 27, 2014 6:23 AM
Subject: Re: [git-users] Cherry picking fails for obscure reasons
Am Dienstag, 26. August 2014 20:38:56 UTC+2 schrieb Philip Oakley:
- Original
Hallöchen!
Am Mittwoch, 27. August 2014 08:34:54 UTC+2 schrieb Philip Oakley:
*From:* Torsten Bronger javascript:
*To:* git-...@googlegroups.com javascript:
*Cc:* philip...@iee.org javascript:
*Sent:* Wednesday, August 27, 2014 6:23 AM
*Subject:* Re: [git-users] Cherry picking fails
From: Torsten Bronger
To: git-users@googlegroups.com
Cc: philipoak...@iee.org
Sent: Wednesday, August 27, 2014 7:52 AM
Subject: Re: [git-users] Cherry picking fails for obscure reasons
Hallöchen!
Am Mittwoch, 27. August 2014 08:34:54 UTC+2 schrieb Philip Oakley:
From:
On Tue, 26 Aug 2014 16:24:28 -0400
wor...@alum.mit.edu (Dale R. Worley) wrote:
I've got a Git repository that I use to log updates to system files.
Not things in /var that change every day, but configuration files in
/etc, binaries in /usr, etc. Of course, the repository is large, 9 or
10 GB
There is a way to configure my git-scm to be case sensitive ?
git init
echo a a
git add a
git commit -m a
mv a A
git status
with git-scm: Nothing to commit
with cygwin git: deleted a
Note:
My cygwin is configured with /etc/fstab: none /cygdrive cygdrive
binary,posix=1,user 0 0
and
On Wed, 27 Aug 2014 07:44:11 -0700 (PDT)
Alcolo Alcolo alcol...@gmail.com wrote:
There is a way to configure my git-scm to be case sensitive ?
[...]
I can use cygwin git, but I'd like to use tortoiseGit based on
git-scm. Then I would like to have the same behaviour.
There's no such thing as
From: Konstantin Khomoutov flatw...@users.sourceforge.net
What I'm leading you to, is that, IMO, trying to fight this behaviour
relied upon by so many pieces of software is counter-productive except
for very special and isolated cases.
So I'd rather fix the project you're working on to have
From: Gopi Naidu chgopina...@gmail.com
getting the issue with git rebase command on HPIA machine
bash-4.0$ git version
git version 2.0.4
bash-4.0$ uname -a
HP-UX machine-name B.11.31 U ia64 1660207278 unlimited-user license
bash-4.0$ git rebase
fatal: Uh oh. Your system reports no Git
I thought I understood cherry-picking, but can't get it to work in
practice. Can somebody please explain what I'm missing?
*Setup*
1. Start with a plain text file in *master* with two rows in it (one
commit per row):
1. L1
2. L2
2. Create a branch (*workbranch*) and check
I thought I understood cherry-picking, but can't get it to work in
practice. Can somebody please explain what I'm missing?
*Setup*
1. Start with a plain text file in *master* with two rows in it (one
commit per row):
1. L1
2. L2
2. Create a branch (*workbranch*) and
Hello Brian,
the patch you are getting is actually the difference between L3 and
workbranch (Line3). What you are facing is a conflict resolution: you have
different modifications for the same file; in this case, both master~1 and
workbranch added lines to the test.txt file, and now you have to
11 matches
Mail list logo
