[PATCH v2 05/15] user-manual: Add a few references to 'git rebase -i'

2013-02-10 Thread W. Trevor King
From: "W. Trevor King" I think this interface is much more convenient than extended cherry picking or using 'git format-patch'. Inserting a number of references should raise awareness among new users. The previously discussed methods (cherry picking and format-patch-ing) are still useful, becau

[PATCH v2 15/15] user-manual: Use --format=tar.gz to create a gzipped tarball

2013-02-10 Thread W. Trevor King
From: "W. Trevor King" This functionality was introduced by 0e804e09 (archive: provide builtin .tar.gz filter, 2011-07-21) for v1.7.7. Signed-off-by: W. Trevor King --- Documentation/user-manual.txt | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Documentation/user-

[PATCH v2 01/15] user-manual: Rewrite git-gc section for automatic packing

2013-02-10 Thread W. Trevor King
From: "W. Trevor King" This should have happened back in 2007, when `git gc` learned about auto (e9831e8, git-gc --auto: add documentation, 2007-09-17). Signed-off-by: W. Trevor King --- Documentation/user-manual.txt | 16 +--- 1 file changed, 5 insertions(+), 11 deletions(-) diff

[PATCH v2 13/15] user-manual: Fix 'you - Git' -> 'you--Git' typo

2013-02-10 Thread W. Trevor King
From: "W. Trevor King" Use an em-dash, not a hyphen, to join these clauses. Signed-off-by: W. Trevor King --- Documentation/user-manual.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 6446791..dbd0143 1

[PATCH v2 04/15] user-manual: Use git branch --merged

2013-02-10 Thread W. Trevor King
From: "W. Trevor King" Use 'git branch --merged origin'. This feature was introduced by 049716b (branch --merged/--no-merged: allow specifying arbitrary commit, 2008-07-08), after the documentation that's being replaced moved into the manual with 9e2163ea (user-manual: move howto/using-topic-bra

[PATCH v2 10/15] user-manual: Fix 'both: so' -> 'both; so' typo

2013-02-10 Thread W. Trevor King
From: "W. Trevor King" The clause "so `git log ...` will return no commits..." is independent, not a description of "both", so a semicolon is more appropriate. Signed-off-by: W. Trevor King --- Documentation/user-manual.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Do

[PATCH v2 09/15] user-manual: Use 'git config --global user.*' for setup

2013-02-10 Thread W. Trevor King
From: "W. Trevor King" A simple command line call is easier than spawning an editor, especially for folks new to ideas like the "command line" and "text editors". This is also the approach suggested by 'git commit' if you try and commit without having configured user.name or user.email. Signed-

[PATCH v2 06/15] user-manual: Give 'git push -f' as an alternative to +master

2013-02-10 Thread W. Trevor King
From: "W. Trevor King" This mirrors existing language in the description of 'git fetch'. Signed-off-by: W. Trevor King --- Documentation/user-manual.txt | 7 +++ 1 file changed, 7 insertions(+) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 5d80b40..a68d6

[PATCH v2 12/15] user-manual: Use request-pull to generate "please pull" text

2013-02-10 Thread W. Trevor King
From: "W. Trevor King" Less work and more error checking (e.g. does a merge base exist?). Signed-off-by: W. Trevor King --- Documentation/user-manual.txt | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.tx

[PATCH v2 00/15] User manual updates

2013-02-10 Thread W. Trevor King
From: "W. Trevor King" This combines my ealier patches: * user-manual: Rewrite git-gc section for automatic packing * user-manual: Update for receive.denyCurrentBranch=refuse With a number of additional fixups. Changes since v1: * user-manual: Rewrite git-gc section for automatic packing: -

[PATCH v2 11/15] user-manual: Fix 'http' -> 'HTTP' typos

2013-02-10 Thread W. Trevor King
From: "W. Trevor King" HTTP is an acronym which has not (yet) made the transition to word status (unlike "laser", probably because lasers are inherently cooler than HTTP ;). Signed-off-by: W. Trevor King --- Documentation/user-manual.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-

[PATCH v2 14/15] user-manual: Flesh out uncommitted changes and submodule updates

2013-02-10 Thread W. Trevor King
From: "W. Trevor King" If you try and update a submodule with a dirty working directory, you get an error message like: $ git submodule update error: Your local changes to the following files would be overwritten by checkout: ... Please, commit your changes or stash them before you can

[PATCH v2 03/15] user-manual: Use 'remote add' to setup push URLs

2013-02-10 Thread W. Trevor King
From: "W. Trevor King" There is no need to use here documents to setup this configuration. It is easier, less confusing, and more robust to use Git's configuration tools directly. Signed-off-by: W. Trevor King --- Documentation/user-manual.txt | 17 ++--- 1 file changed, 10 inserti

Re: inotify to minimize stat() calls

2013-02-10 Thread demerphq
On 10 February 2013 12:17, Duy Nguyen wrote: > Bear in mind though this is Linux, where lstat is fast. On systems > with slow lstat, these timings could look very different due to the > large number of lstat calls compared to open+getdents. I really like > to see similar numbers on Windows. Is wi

[PATCH] fixup! graph: output padding for merge subsequent parents

2013-02-10 Thread John Keeping
--- On Sat, Feb 09, 2013 at 03:39:33PM -0800, Junio C Hamano wrote: > * jk/diff-graph-cleanup (2013-02-07) 6 commits > - combine-diff.c: teach combined diffs about line prefix > - diff.c: use diff_line_prefix() where applicable > - diff: add diff_line_prefix function > - diff.c: make constant s

Re: Feature request: Allow extracting revisions into directories

2013-02-10 Thread Thomas Koch
Robert Clausecker: > I have a server that hosts a bare git repository. This git repository > contains a branch production. Whenever somebody pushes to production a > hook automatically puts a copy of the current production branch > into /var/www/foo. I could of course use pull for that but it just

Re: inotify to minimize stat() calls

2013-02-10 Thread Duy Nguyen
On Sun, Feb 10, 2013 at 06:17:32PM +0700, Duy Nguyen wrote: > The following patch eliminates untracked search code. As we can see, > open+getdents also disappears with this patch: > > 0.462909 40950 lstat 0.462909 40950 lstat > 0.003417 129 brk 0.003417 129 brk > 0.000762 53 read 0.0

Re: inotify to minimize stat() calls

2013-02-10 Thread Duy Nguyen
On Sun, Feb 10, 2013 at 12:24:58PM +0700, Duy Nguyen wrote: > On Sun, Feb 10, 2013 at 12:10 AM, Ramkumar Ramachandra > wrote: > > Finn notes in the commit message that it offers no speedup, because > > .gitignore files in every directory still have to be read. I think > > this is silly: we really

Re: [Request] Git export with hardlinks

2013-02-10 Thread Thomas Koch
Jeff King: > [...] > So a full checkout is 24M. For the next deploy, we'll start by asking > "cp" to duplicate the old, using hard links: Hi Jeff, thank you very much for your idea! It's good and simple. It just breaks down for the case when a large folder got renamed. But I already hacked the

<    1   2