delta/git.git, branch bw/grep-no-index-no-exclude

grep --no-index: don't use git standard exclusions

2011-09-15T19:27:40+00:00

The --no-index mode is intended to be used outside of a git repository, and
it does not make sense to apply the git standard exclusions outside a git
repositories.

Signed-off-by: Bert Wesarg 
Signed-off-by: Junio C Hamano

grep: do not use --index in the short usage output

2011-09-15T19:17:56+00:00

Utilize the PARSE_OPT_NEGHELP option to show --no-index in the usage
generated by parse-options.

Signed-off-by: Bert Wesarg 
Signed-off-by: Junio C Hamano

Resurrect "git grep --no-index"

2010-02-13T23:07:14+00:00

This reverts commit 3c8f6c8 (Revert 30816237 and 7e62265, 2010-02-05) as
the issue has been sorted out.

setenv(GIT_DIR) clean-up

2010-02-06T18:39:20+00:00

This patch converts the setenv() calls in path.c and setup.c.  After
the call, git grep with a pager works again in bare repos.

It leaves the setenv(GIT_DIR_ENVIRONMENT, ...) calls in git.c alone, as
they respond to command line switches that emulate the effect of setting
the environment variable directly.

The remaining site in environment.c is in set_git_dir() and is left
alone, too, of course.  Finally, builtin-init-db.c is left changed
because the repo is still being carefully constructed when the
environment variable is set.

This fixes git shortlog when run inside a git directory, which had been
broken by abe549e1.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

t9501: Re-fix max load test

2010-02-06T18:33:07+00:00

Revert the previous attempt to skip this test on platforms where we
currently cannot determine the system load.  We want to make sure that
the max-load-limit codepath produces results cleanly, when gitweb is
updated and becomes capable of reading the load average by some other
method.

The code to check for load returns 0 if it doesn't know how to find
load.  It also checks to see if the current load is higher than the
max load.  So to force the script to quit early by setting the maxload
variable negative which should work for systems where we can detect
load (which should be a positive number) and systems where we can't
(where detected load is 0)

Signed-off-by: Brian Gernhardt 
Signed-off-by: Junio C Hamano

bash: support the --autosquash option for rebase

2010-02-06T17:51:43+00:00

Signed-off-by: Björn Gustavsson 
Signed-off-by: Junio C Hamano

Merge git://git.kernel.org/pub/scm/gitk/gitk

2010-02-06T05:22:59+00:00

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix copyright symbol in About box message

t9501: Skip testing load if we can't detect it

2010-02-06T05:12:06+00:00

Currently gitweb only knows how to check for load using /proc/loadavg,
which isn't available on all systems.  We shouldn't fail the test just
because we don't know how to check the system load.

Signed-off-by: Brian Gernhardt 
Signed-off-by: Junio C Hamano

Update draft release notes to 1.7.0

2010-02-06T00:36:56+00:00

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2010-02-06T00:34:00+00:00

* maint:
  Update git fsck --full short description to mention packs