On Mon, Sep 28, 2015 at 2:19 PM, Junio C Hamano wrote:
> I agree with you if we limit the scope to "reset --hard" that does
> not mention any commit on the command line (or says "HEAD").
>
> However, for things like:
>
> $ git reset --hard HEAD^ Makefile
> $ git reset --hard HEAD@{4.hours.
Am 28.09.2015 um 14:52 schrieb Johannes Schindelin:
> Otherwise there would be that little loop-hole where (nsec % 1000) == 0 *by
> chance* and we assume the timestamps to be identical even if they are not.
Yeah, but in this case the file would be racy, as racy-checks use
the same comparison now.
Am 28.09.2015 um 19:38 schrieb Junio C Hamano:
> Karsten Blees writes:
>
>> Problem 1: Failure to detect racy files (without USE_NSEC)
>> ==
>>
>> Git may not detect racy changes when 'update-index' runs in parallel
>> to work tree updates.
Hi Karsten,
On 2015-09-29 12:23, Karsten Blees wrote:
> Am 28.09.2015 um 14:52 schrieb Johannes Schindelin:
>> Otherwise there would be that little loop-hole where (nsec % 1000) == 0 *by
>> chance* and we assume the timestamps to be identical even if they are not.
>
> Yeah, but in this case the
Hi,
I'm installing git and gitk from the Ubuntu PPA maintained by the Git
team. I received the Git 2.6 update today.
Since this update, I'm unable to launch gitk with --all. I'm receiving
the following error message:
Error in startup script: bad menu entry index "Éditer la vue..."
while e
On Tue, 29 Sep 2015 15:40:55 +0200
Christophe COEVOET wrote:
> I'm installing git and gitk from the Ubuntu PPA maintained by the Git
> team. I received the Git 2.6 update today.
> Since this update, I'm unable to launch gitk with --all. I'm
> receiving the following error message:
>
> Error in
Le 29/09/2015 15:49, Konstantin Khomoutov a écrit :
On Tue, 29 Sep 2015 15:40:55 +0200
Christophe COEVOET wrote:
I'm installing git and gitk from the Ubuntu PPA maintained by the Git
team. I received the Git 2.6 update today.
Since this update, I'm unable to launch gitk with --all. I'm
receivi
On Tue, 29 Sep 2015 15:51:46 +0200
Christophe COEVOET wrote:
> >> I'm installing git and gitk from the Ubuntu PPA maintained by the
> >> Git team. I received the Git 2.6 update today.
> >> Since this update, I'm unable to launch gitk with --all. I'm
> >> receiving the following error message:
> >
Hi,
I noticed that the format of the comment lines in a rebase instruction
sheet has become stricter - it could no longer begin with spaces or
tabs. The comment char ("#" for example) has to appear on the first
column.
This break my little script (activated via some key binding in my
$EDITOR) for
From: Stefan Agner
See http://permalink.gmane.org/gmane.comp.version-control.git/274569
Reported-by: Juston Li
Tested-by: Markos Chandras
Signed-off-by: Lars Wendler
---
git-send-email.perl | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/git-send-email.perl b/git-sen
Nazri Ramliy writes:
> I'd hit that key in my editor that filters the pick instructions add
> inserts the list of the modified files in each commit so that the
> instruction sheet becomes like this:
>
> pick deadbeef some commit message
> # M path/to/foo.txt | 15 --
> pick ca
Hi Lars,
On 2015-09-29 17:00, Lars Wendler wrote:
> From: Stefan Agner
>
> See http://permalink.gmane.org/gmane.comp.version-control.git/274569
Please summarize the linked discussion in the commit message, as it is the
convention here in the Git project to make commit messages self-sufficient,
> I agree with you if we limit the scope to "reset --hard" that does
> not mention any commit on the command line (or says "HEAD").
>
> However, for things like:
>
> $ git reset --hard HEAD^ Makefile
> $ git reset --hard HEAD@{4.hours.ago} Makefile
>
> I do not think "reset --hard" is a go
Matthieu Moy writes:
> Nazri Ramliy writes:
>
>> I'd hit that key in my editor that filters the pick instructions add
>> inserts the list of the modified files in each commit so that the
>> instruction sheet becomes like this:
>>
>> pick deadbeef some commit message
>> # M path/to/foo.txt
Git core has had automatic garbage collection for a long time.
Git-gui does not need a similar heuristic.
Signed-off-by: Beat Bolli
Cc: Pat Thoyts
---
git-gui.sh | 3 ---
lib/database.tcl | 26 --
2 files changed, 29 deletions(-)
diff --git a/git-gui.sh b/git-gui
Matthieu Moy writes:
>> Confirmed: Git 2.1.4 accepts this, 2.6 doesn't:
>>
>> Warning: the command isn't recognized in the following line:
>> - # pick dbafac11052a0075233bdcf0b71f54d1503aa82d test
>>
>> You can fix this with 'git rebase --edit-todo'.
>> Or you can abort the rebase with 'git reba
Junio C Hamano writes:
> I know you alluded to preprocess what is fed to stripspace, but I
> wonder if we can remove the misguided call to stripspace in the
> first place and do something like the attached instead.
>
> git-rebase--interactive.sh | 3 +--
> 1 file changed, 1 insertion(+), 2 delet
2015-09-29 20:17 GMT+02:00 Junio C Hamano :
> Matthieu Moy writes:
>
>>> Confirmed: Git 2.1.4 accepts this, 2.6 doesn't:
>>>
>>> Warning: the command isn't recognized in the following line:
>>> - # pick dbafac11052a0075233bdcf0b71f54d1503aa82d test
>>>
>>> You can fix this with 'git rebase --edit
From: "Jacob Keller"
On Mon, Sep 28, 2015 at 1:42 PM, Junio C Hamano wrote:
"George Spelvin" writes:
I understand that "git reset --soft" makes no sense with a path, but
why not --hard?
I do not think there is anything fundamentally wrong for wishing for
"reset --hard ". It probably is ju
Dear Git users,
it is my pleasure to announce that Git for Windows 2.6.0 is available (see
https://git-for-windows.github.io/ for details and download links).
Thank you, contributors!
Changes since Git for Windows 2.5.3 (September 18th 2015)
New Features
• Comes with Git 2.6.0
• The WhoUs
On Thu, Sep 24, 2015 at 2:07 PM, Jeff King wrote:
> The init code predates strbufs, and uses PATH_MAX-sized
> buffers along with many manual checks on intermediate sizes
> (some of which make magic assumptions, such as that init
> will not create a path inside .git longer than 50
> characters).
>
On Tue, Sep 29, 2015 at 04:50:39PM -0700, Michael Blume wrote:
> I see compile errors on my mac:
>
> First a whole bunch of
>
> ./compat/precompose_utf8.h:30:45: warning: declaration of 'struct
> strbuf' will not be visible outside of this function [-Wvisibility]
> void probe_utf8_pathname_compo
Stefan Beller writes:
> + while (1) {
> + int i;
> + int output_timeout = 100;
> + int spawn_cap = 4;
> +
> + if (!no_more_task) {
> + for (i = 0; i < spawn_cap; i++) {
> + int code;
> +
Stefan Beller writes:
> The new method removes all common signal handlers that were installed
> by sigchain_push.
>
> CC: Jeff King
> Signed-off-by: Stefan Beller
> ---
> sigchain.c | 9 +
> sigchain.h | 1 +
> 2 files changed, 10 insertions(+)
Sounds like a good idea, as you need to
24 matches
Mail list logo