git/git.c, branch v1.5.6.4

Ignore .gitattributes in bare repositories

2008-06-09T22:08:26Z

Attributes can be specified at three different places: the internal table of default values, the file $GIT_DIR/info/attributes and files named .gitattributes in the work tree. Since bare repositories don't have a work tree, git should ignore any .gitattributes files there. This patch makes git do that, so the only way left for a user to specify attributes in a bare repository is the file info/attributes (in addition to changing the defaults and recompiling). In addition, git-check-attr is now allowed to run without a work tree. Like any user of the code in attr.c, it ignores the .gitattributes files when run in a bare repository. It can still read from info/attributes. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Print info about "git help COMMAND" on git's main usage pages

2008-06-06T16:22:18Z

Git's main usage pages did not show "git help" as a way to get more information on a specific subcommand. This patch adds an info line after the list of git commands currently printed by "git", "git help", "git --help" and "git help --all". Signed-off-by: Teemu Likonen Signed-off-by: Junio C Hamano

Merge branch 'jc/diff-no-no-index'

2008-05-27T05:38:19Z

* jc/diff-no-no-index: git diff --no-index: default to page like other diff frontends git-diff: allow --no-index semantics a bit more "git diff": do not ignore index without --no-index diff-files: do not play --no-index games tests: do not use implicit "git diff --no-index"

diff-files: do not play --no-index games

2008-05-24T07:07:38Z

Being able to say "git diff A B" outside a git repository and getting a colourful version of "diff -u A B" may be nice, but such a cute hack should not give bogus results to scripts that want to give two paths, either or both of which happen to have been removed from the work tree, to "git diff-files". Signed-off-by: Junio C Hamano

Build in clone

2008-05-05T00:41:45Z

Thanks to Johannes Schindelin for various comments and improvements, including supporting cloning full bundles. Signed-off-by: Junio C Hamano

make git-status use a pager

2008-04-30T06:11:57Z

make git status act similar to git log and git diff by presenting long output in a pager. Signed-off-by: Bart Trojanowski Signed-off-by: Junio C Hamano

Accept git aliases outside a git repository

2008-04-02T06:40:02Z

af05d67 (Always set *nongit_ok in setup_git_directory_gently(), 2008-03-25) had a change from the patch originally submitted that resulted in disabling aliases outside a git repository. It turns out that some people used "alias.fubar = diff --color-words" in $HOME/.gitconfig to use non-index diff (or any command that do not need git repository) outside git repositories, and this change broke them, so this resurrects the support for such usage. Signed-off-by: Junio C Hamano

Always set *nongit_ok in setup_git_directory_gently()

2008-03-26T22:41:35Z

setup_git_directory_gently() only modified the value of its *nongit_ok argument if we were not in a git repository. Now it will always set it to 0 when we are inside a repository. Also remove now unnecessary initializations in the callers of this function. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano

shortlog: do not require to run from inside a git repository

2008-03-15T07:49:15Z

Once upon a time shortlog could be run from a non-git directory and still do its job. Fix this regression and add a small test for it. Signed-off-by: Jonas Fonseca Signed-off-by: Junio C Hamano

Make git-remote a builtin

2008-03-01T09:51:44Z

Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano