Re: [PATCH] [RFC] Add a new config. option for skipping merges in git-log

2015-03-16 Thread Junio C Hamano
Koosha Khajehmoogahi writes: > On 03/16/2015 09:50 PM, Junio C Hamano wrote: >> The command line overrides the config, no? If you set up what the >> command line defaults to from the config, let the command line >> parser do whatever it wants to do, and do nothing else after the >> command line

Re: [PATCH] [RFC] Add a new config. option for skipping merges in git-log

2015-03-16 Thread Koosha Khajehmoogahi
On 03/16/2015 09:50 PM, Junio C Hamano wrote: > The command line overrides the config, no? If you set up what the > command line defaults to from the config, let the command line > parser do whatever it wants to do, and do nothing else after the > command line parser returns, wouldn't that be su

Re: [PATCH] [RFC] Add a new config. option for skipping merges in git-log

2015-03-16 Thread Junio C Hamano
Koosha Khajehmoogahi writes: > Thanks for your suggestions. The "extra bit" in rev_info is used when > we need to compare user's command-line input to his configuration. Since > command-line input is processed in revision.c but config. options are read > in builtin/log.c, we need a way to pass th

Re: [PATCH] [RFC] Add a new config. option for skipping merges in git-log

2015-03-16 Thread Koosha Khajehmoogahi
On 03/16/2015 06:53 PM, Junio C Hamano wrote: > Koosha Khajehmoogahi writes: > >> This patch adds a 'showmerges' config. option for git-log. >> This option determines whether the log should contain merge >> commits or not. In essence, if this option is set to false, >> git-log will be run as 'gi

Re: [PATCH] [RFC] Add a new config. option for skipping merges in git-log

2015-03-16 Thread Junio C Hamano
Koosha Khajehmoogahi writes: > This patch adds a 'showmerges' config. option for git-log. > This option determines whether the log should contain merge > commits or not. In essence, if this option is set to false, > git-log will be run as 'git-log --no-merges'. > > To force git-log to show merges

[PATCH] [RFC] Add a new config. option for skipping merges in git-log

2015-03-16 Thread Koosha Khajehmoogahi
This patch adds a 'showmerges' config. option for git-log. This option determines whether the log should contain merge commits or not. In essence, if this option is set to false, git-log will be run as 'git-log --no-merges'. To force git-log to show merges even if 'log.showmerges' is set, we use -

[PATCH] [RFC] Add a new config. option for skipping merges in git-log

2015-03-16 Thread Koosha Khajehmoogahi
This patch adds a 'showmerges' config. option for git-log. This option determines whether the log should contain merge commits or not. In essence, if this option is set to false, git-log will be run as 'git-log --no-merges'. To force git-log to show merges even if 'log.showmerges' is set, we use

[PATCH] [RFC] Add a new config. option for skipping merges in git-log

2015-03-16 Thread Koosha Khajehmoogahi
This patch adds a 'showmerges' config. option for git-log. This option determines whether the log should contain merge commits or not. In essence, if this option is set to false, git-log will be run as 'git-log --no-merges'. To force git-log to show merges even if 'log.showmerges' is set, we use