diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-03-26 12:30:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-26 12:30:51 -0700 |
| commit | ee459baa5ce0a144e013a4995fd5be96bbecd05e (patch) | |
| tree | f291bb9ded81ca52fe5b3c416ffd0d801dae9a80 | |
| parent | Merge gitk changes from Paul Mackerras at git://ozlabs.org/~paulus/gitk (diff) | |
| parent | Git 1.7.9.5 (diff) | |
| download | tgif-ee459baa5ce0a144e013a4995fd5be96bbecd05e.tar.xz | |
Sync with 1.7.9.5
| -rw-r--r-- | Documentation/RelNotes/1.7.9.5.txt | 23 | ||||
| -rw-r--r-- | Documentation/git-grep.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-rebase.txt | 7 | ||||
| -rw-r--r-- | Documentation/git.txt | 9 |
4 files changed, 38 insertions, 3 deletions
diff --git a/Documentation/RelNotes/1.7.9.5.txt b/Documentation/RelNotes/1.7.9.5.txt new file mode 100644 index 0000000000..95cc2bbf2c --- /dev/null +++ b/Documentation/RelNotes/1.7.9.5.txt @@ -0,0 +1,23 @@ +Git v1.7.9.5 Release Notes +========================== + +Fixes since v1.7.9.4 +-------------------- + + * When "git config" diagnoses an error in a configuration file and + shows the line number for the offending line, it miscounted if the + error was at the end of line. + + * "git fast-import" accepted "ls" command with an empty path by + mistake. + + * Various new-ish output decoration modes of "git grep" were not + documented in the manual's synopsis section. + + * The "remaining" subcommand to "git rerere" was not documented. + + * "gitweb" used to drop warnings in the log file when "heads" view is + accessed in a repository whose HEAD does not point at a valid + branch. + +Also contains minor fixes and documentation updates. diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index 6a8b1e3a7d..343eadd407 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -20,7 +20,9 @@ SYNOPSIS [-c | --count] [--all-match] [-q | --quiet] [--max-depth <depth>] [--color[=<when>] | --no-color] + [--break] [--heading] [-p | --show-function] [-A <post-context>] [-B <pre-context>] [-C <context>] + [-W | --function-context] [-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>...] [ [--exclude-standard] [--cached | --no-index | --untracked] | <tree>...] diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 504945c691..520aaa94fb 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -409,10 +409,13 @@ The interactive mode is meant for this type of workflow: where point 2. consists of several instances of -a. regular use +a) regular use + 1. finish something worthy of a commit 2. commit -b. independent fixup + +b) independent fixup + 1. realize that something does not work 2. fix that 3. commit it diff --git a/Documentation/git.txt b/Documentation/git.txt index d5b7667c15..7ccb55d148 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.9.4/git.html[documentation for release 1.7.9.4] +* link:v1.7.9.5/git.html[documentation for release 1.7.9.5] * release notes for + link:RelNotes/1.7.9.5.txt[1.7.9.5], link:RelNotes/1.7.9.4.txt[1.7.9.4], link:RelNotes/1.7.9.3.txt[1.7.9.3], link:RelNotes/1.7.9.2.txt[1.7.9.2], @@ -711,6 +712,12 @@ other a pager. See also the `core.pager` option in linkgit:git-config[1]. +'GIT_EDITOR':: + This environment variable overrides `$EDITOR` and `$VISUAL`. + It is used by several git comands when, on interactive mode, + an editor is to be launched. See also linkgit:git-var[1] + and the `core.editor` option in linkgit:git-config[1]. + 'GIT_SSH':: If this environment variable is set then 'git fetch' and 'git push' will use this command instead |