Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Max Horn m...@quendi.de writes: ... The reality is more like this: origin/master in your repository | v A---B---C master at origin / D---E---F---G master in your repository if you really want to write origin/master

Re: [PATCH 07/16] branch: trivial style fix

2013-10-31 Thread Junio C Hamano
Looks good; thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH 15/16] setup: trivial style fixes

2013-10-31 Thread Junio C Hamano
Patches 7 through this one looks good; thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/3] for-each-ref: introduce %C(...) for color

2013-10-31 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Enhance 'git for-each-ref' with color formatting options. You can now use the following format in for-each-ref: %C(green)%(refname:short)%C(reset) So far, every magic for-each-ref takes were of form %(...); was there a reason why this had to

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Felipe Contreras
On Thu, Oct 31, 2013 at 2:27 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Thu, Oct 31, 2013 at 1:00 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Thu, Oct 31, 2013 at 12:11 PM, Junio C

Re: [PATCH 06/16] shortlog: add missing declaration

2013-10-31 Thread Felipe Contreras
On Thu, Oct 31, 2013 at 2:07 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Thu, Oct 31, 2013 at 1:05 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Otherwise we would have to include

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Felipe Contreras
On Thu, Oct 31, 2013 at 2:43 PM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: The other reason the original did not say origin/master is because this holds true even if you do not have such a remote-tracking branch for the master at the origin, but the

[PATCH] Documentation: restore a space in unpack-objects usage

2013-10-31 Thread Vivien Didelot
The commit 87b7b84 removed a space in the unpack-objects usage, which makes the synopsis a bit confusing. This patch simply restores it. Signed-off-by: Vivien Didelot vivien.dide...@savoirfairelinux.com --- Documentation/git-unpack-objects.txt | 2 +- 1 file changed, 1 insertion(+), 1

Re: [PATCH] Documentation: restore a space in unpack-objects usage

2013-10-31 Thread Junio C Hamano
Vivien Didelot vivien.dide...@savoirfairelinux.com writes: The commit 87b7b84 removed a space in the unpack-objects usage, which makes the synopsis a bit confusing. This patch simply restores it. Signed-off-by: Vivien Didelot vivien.dide...@savoirfairelinux.com ---

Re: [PATCH v5 09/10] fast-export: add support to delete refs

2013-10-31 Thread Max Horn
On 31.10.2013, at 20:53, Felipe Contreras felipe.contre...@gmail.com wrote: On Thu, Oct 31, 2013 at 1:47 PM, Max Horn m...@quendi.de wrote: On 31.10.2013, at 20:41, Felipe Contreras felipe.contre...@gmail.com wrote: On Thu, Oct 31, 2013 at 1:29 PM, Max Horn m...@quendi.de wrote: [...]

Re: [PATCH 3/3] remote-curl: fix large pushes with GSSAPI

2013-10-31 Thread brian m. carlson
On Thu, Oct 31, 2013 at 02:36:51AM -0400, Jeff King wrote: From: brian m. carlson sand...@crustytoothpaste.net Due to an interaction between the way libcurl handles GSSAPI authentication over HTTP and the way git uses libcurl, large pushes (those over http.postBuffer bytes) would fail due to

Re: [PATCH] commit: Add -f, --fixes commit option to add Fixes: line

2013-10-31 Thread Stefan Beller
On 10/27/2013 05:30 PM, Thomas Rast wrote: Stefan Beller stefanbel...@googlemail.com writes: I assembled an overview table, which plots the long options of git commands by the short letters. [...] (In case thunderbird messes it up, here it is again http://pastebin.com/raw.php?i=JBci2Krx)

[PATCH] Documentation: add a script to generate a (long/short) options overview

2013-10-31 Thread Stefan Beller
Recently a discussion started on the mailing list, which short option shall be best for a long option. (-f being always --force and therefore should not be reassigned another meaning in one particular command) See http://www.mail-archive.com/git@vger.kernel.org/msg38456.html For discussions as

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread David Aguilar
On Thu, Oct 31, 2013 at 03:16:57PM -0600, Felipe Contreras wrote: On Thu, Oct 31, 2013 at 2:43 PM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: The other reason the original did not say origin/master is because this holds true even if you do not have

Re: [PATCH] Documentation: add a script to generate a (long/short) options overview

2013-10-31 Thread brian m. carlson
On Fri, Nov 01, 2013 at 12:09:10AM +0100, Stefan Beller wrote: On 11/01/2013 12:04 AM, Stefan Beller wrote: Recently a discussion started on the mailing list, which short option shall be best for a long option. (-f being always --force and therefore should not be reassigned another meaning

Re: [PATCH] commit: Add -f, --fixes commit option to add Fixes: line

2013-10-31 Thread Duy Nguyen
On Fri, Nov 1, 2013 at 12:20 AM, Junio C Hamano gits...@pobox.com wrote: Duy Nguyen pclo...@gmail.com writes: OK how about, if $GIT_DIR/hooks/something is a directory, then the directory must contain a file named index, listing all the hooks of type something. All the hooks in index will be

Re: [PATCH] Documentation: add a script to generate a (long/short) options overview

2013-10-31 Thread Junio C Hamano
brian m. carlson sand...@crustytoothpaste.net writes: RFC 5321 forbids lines exceeding 1000 octets (including CRLF). RFC 5322 forbids lines exceeding 998 characters (excluding CRLF). If you want to get around that, you need to base64-encode the content, which is generally discouraged when

Re: [PATCH] commit: Add -f, --fixes commit option to add Fixes: line

2013-10-31 Thread Johan Herland
On Thu, Oct 31, 2013 at 6:20 PM, Junio C Hamano gits...@pobox.com wrote: Duy Nguyen pclo...@gmail.com writes: OK how about, if $GIT_DIR/hooks/something is a directory, then the directory must contain a file named index, listing all the hooks of type something. All the hooks in index will be

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Felipe Contreras
On Thu, Oct 31, 2013 at 5:40 PM, David Aguilar dav...@gmail.com wrote: On Thu, Oct 31, 2013 at 03:16:57PM -0600, Felipe Contreras wrote: On Thu, Oct 31, 2013 at 2:43 PM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: The other reason the original did not

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread David Aguilar
On Thu, Oct 31, 2013 at 07:56:03PM -0600, Felipe Contreras wrote: On Thu, Oct 31, 2013 at 5:40 PM, David Aguilar dav...@gmail.com wrote: On Thu, Oct 31, 2013 at 03:16:57PM -0600, Felipe Contreras wrote: On Thu, Oct 31, 2013 at 2:43 PM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Felipe Contreras
On Thu, Oct 31, 2013 at 8:48 PM, David Aguilar dav...@gmail.com wrote: On Thu, Oct 31, 2013 at 07:56:03PM -0600, Felipe Contreras wrote: Nobody is forcing you to read them. You're missing the *key* point. No one wants to interact with a rude arrogant loudmouth. Then don't. Problem solved.

<    1   2