From: Johannes Sixt <J.Sixt@eudaptics•com>
To: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Cc: Alex Riesen <raa.lkml@gmail•com>, git@vger•kernel.org
Subject: Re: most commonly used git commands?
Date: Thu, 28 Jun 2007 16:49:30 +0200 [thread overview]
Message-ID: <4683CA7A.7F8070D7@eudaptics.com> (raw)
In-Reply-To: 4683C5D2.FDF4ED02@eudaptics.com
Johannes Sixt wrote:
> AFAIAC, it's alright to fall back to update-index for those occasions,
> even though they are not that rare due to a deficiency of
> merge-recursive: When it merges an executable file, it loses the +x bit,
> even if core.filemode=false!
I take that back.
The deficiency is not in merge-recursive, but in 'git add'. The problem
is that after a conflicted merge of an executable file 'git add' loses
the +x bit even if core.filemode=false.
-- Hannes
next prev parent reply other threads:[~2007-06-28 14:50 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-25 6:40 most commonly used git commands? Michael S. Tsirkin
2007-06-25 7:10 ` Junio C Hamano
2007-06-25 7:17 ` Michael S. Tsirkin
2007-06-25 7:48 ` Junio C Hamano
2007-06-28 2:17 ` Martin Langhoff
2007-06-28 2:30 ` Josh Triplett
2007-06-25 7:51 ` Johannes Schindelin
2007-06-28 8:52 ` Alex Riesen
2007-06-28 13:08 ` Johannes Schindelin
2007-06-28 13:54 ` Johannes Sixt
2007-06-28 14:07 ` Johannes Schindelin
2007-06-28 14:29 ` Johannes Sixt
2007-06-28 14:49 ` Johannes Sixt [this message]
2007-06-28 17:02 ` [PATCH] git add: respect core.filemode even with unmerged entries in the index Johannes Schindelin
2007-06-29 6:57 ` [PATCH] git add: respect core.filemode even with unmerged entriesin " Johannes Sixt
2007-06-29 10:07 ` Johannes Schindelin
2007-06-29 10:20 ` Junio C Hamano
2007-06-29 17:32 ` [PATCH] git add: respect core.filemode with unmerged entries Johannes Schindelin
2007-06-29 8:36 ` [PATCH] git add: respect core.filemode even with unmerged entries in the index Junio C Hamano
2007-06-29 10:06 ` Johannes Schindelin
2007-06-30 13:14 ` most commonly used git commands? Alex Riesen
2007-06-30 14:31 ` Johannes Schindelin
2007-06-30 22:35 ` Alex Riesen
2007-07-01 9:16 ` Jan Hudec
2007-07-01 16:49 ` Alex Riesen
2007-06-28 1:37 ` Josh Triplett
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=4683CA7A.7F8070D7@eudaptics.com \
--to=j.sixt@eudaptics$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=raa.lkml@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox