Re: How should git-config include.path option work in ~/.gitconfig file?

2014-06-21 Thread Jeff King
[+cc mailing list] On Sat, Jun 21, 2014 at 03:16:05AM -0600, Cox, Michael wrote: > I discovered the new (to me, at least) git config include.path option > recently and tried using it to include a file, .gitremotes in my git > worktree. The .gitremotes file contains a remote.upstream section > co

gitk does not respect UI fonts

2014-06-21 Thread Heinrich Schuchardt
In gitk three UI fonts may be specified. These used for some GUI elements but not for all. Radioboxes for instance do not use any of the 3 fonts that can be specified. An example is provided here: http://i58.tinypic.com/11kwpp0.png Please, change the coding to always use the specified fonts. --

Re: [RFC PATCH 1/7] rebase -i: Make option handling in pick_one more flexible

2014-06-21 Thread Fabian Ruch
Hi Michael, On 06/20/2014 03:40 PM, Michael Haggerty wrote: > On 06/19/2014 05:28 AM, Fabian Ruch wrote: >> `pick_one` and `pick_one_preserving_merges` are wrappers around >> `cherry-pick` in `rebase --interactive`. They take the hash of a commit >> and build a `cherry-pick` command line that >> >

Re: [RFC PATCH 2/7] rebase -i: Teach do_pick the option --edit

2014-06-21 Thread Fabian Ruch
Hi Michael, On 06/20/2014 03:41 PM, Michael Haggerty wrote: > On 06/19/2014 05:28 AM, Fabian Ruch wrote: >> The to-do list command `reword` replays a commit like `pick` but lets >> the user also edit the commit's log message. If one thinks of `pick` >> entries as scheduled `cherry-pick` command li

Re: [RFC PATCH 3/7] rebase -i: Stop on root commits with empty log messages

2014-06-21 Thread Fabian Ruch
Hi Eric, On 06/21/2014 02:33 AM, Eric Sunshine wrote: > On Wed, Jun 18, 2014 at 11:28 PM, Fabian Ruch wrote: >> When `rebase` is executed with `--root` but no `--onto` is specified, >> `rebase` creates a sentinel commit which is replaced with the root >> commit in three steps. This combination of

autopacking twice?

2014-06-21 Thread Michael S. Tsirkin
I noticed this: remote: Counting objects: 302, done. remote: Compressing objects: 100% (195/195), done. remote: Total 209 (delta 169), reused 15 (delta 14) Receiving objects: 100% (209/209), 42.83 KiB | 0 bytes/s, done. Resolving deltas: 100% (169/169), completed with 67 local objects. >From git://

Re: [msysGit] Re: The different EOL behavior between libgit2-based software and official Git

2014-06-21 Thread Torsten Bögershausen
On 2014-06-20 18.33, Junio C Hamano wrote: > Torsten Bögershausen writes: > > tb@Linux:~/EOL_Test/TestAutoCrlf$ t=LF.txt && rm -f $t && git -c > core.eol=CRLF checkout $t && od -c $t > 000 L i n e 1 \n l i n e ( 2 ) \n > 020 l i n e 3