git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] git.el: Use git-add-file for unmerged files, remove git-resolve-file

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 9, 2009, 19:10 UTC
Message-ID
<7vhbvcszm4.fsf@alter.siamese.dyndns.org>
In-Reply-To
<87ocpk6qwe.fsf@wine.dyndns.org>
Alexandre Julliard <julliard@winehq.org> writes:
Show 26 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
>
>> I do not know all the details of how Emacs keybinding works, but I had an
>> impression that something-x sequence is triggered if you type something-X
>> and you do not have an explicit binding for something-X but you do have a
>> binding for something-x.
>>
>> IOW, if I only have
>>
>> 	(define-key global-map "\C-xc" 'compile)
>>
>> then both "\C-xc" and "\C-xC" runs "compile", but in addition to the
>> above if I also have
>>
>> 	(define-key global-map "\C-xC" 'grep-find)
>>
>> then I can invoke these two commands with lower- and upper- case 'c/C'
>> after control-x.
>>
>> If people have been relying on the historical behaviour that typing "R"
>> marked the path resolved (which may internally have been implemented with
>> whatever way), and if you are removing that binding, wouldn't that now
>> expose them to whatever happens to be bound to "r"?
>
> No, I don't claim to understand exactly how that works for the C-x case,
> but it doesn't apply here, "r" and "R" are two different bindings.

Thanks. I just wanted to make sure that a user who is used to typing "R" won't get the file removed with the new code.

Previous: Alexandre Julliard
Message 6 of 6 in “git.el: Use git-add-file for unmerged files, remove git-resolve-file”
  1. git.el: Use git-add-file for unmerged files, remove git-resolve-fileMartin Nordholts, Sep 3, 2009
  2. Alexandre JulliardSep 8, 2009
  3. Junio C HamanoSep 8, 2009
  4. Junio C HamanoSep 8, 2009
  5. Alexandre JulliardSep 9, 2009
  6. Junio C HamanoSep 9, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.