From d3f2475c01d9e90dbadacbe2c35854f6d11e6409 Mon Sep 17 00:00:00 2001 From: Nelson Benitez Leon Date: Fri, 23 Mar 2012 12:31:39 +0100 Subject: documentation: fix alphabetic ordered list for git-rebase man page An alphabetic ordered list (a.) is converted to numerical in the man page (1.) so context comments naming 'a' were confusing, fix that by not using ordered list notation for 'a' anb 'b' items. Signed-off-by: Nelson Benitez Leon Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 504945c69..520aaa94f 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 -- cgit v1.2.1 From 36384c979da7129393462c2208fd156b1453debd Mon Sep 17 00:00:00 2001 From: "Rodrigo Silva (MestreLion)" Date: Fri, 23 Mar 2012 12:38:42 +0000 Subject: Documentation: improve description of GIT_EDITOR and preference order Previously GIT_EDITOR was not listed in git(1) "Environment Variables" section, which could be very confusing to users. Include it in "other" subsection along with a link to git-var(1), since that is the page that fully describes all places where editor can be set and also their preference order. Also, git-var(1) did not say that hardcoded fallback 'vi' may have been changed at build time. A user could be puzzled if 'nano' pops up even when none of the mentioned environment vars or config.editor are set. Clarify this. Ideally, the build system should be changed to reflect the chosen fallback editor when creating the man pages. Not sure if that is even possible though. Signed-off-by: Rodrigo Silva (MestreLion) Signed-off-by: Junio C Hamano --- Documentation/git.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/git.txt b/Documentation/git.txt index d5b7667c1..458cc076f 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -711,6 +711,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 -- cgit v1.2.1 From a12c6b0149e3dadd0701dac4fd0ba2463d251650 Mon Sep 17 00:00:00 2001 From: Mark Lodato Date: Sun, 25 Mar 2012 22:41:42 -0400 Subject: grep doc: add --break / --heading / -W to synopsis All of the other options were included in the synopsis, so it makes sense to include these as well. Signed-off-by: Mark Lodato Signed-off-by: Junio C Hamano --- Documentation/git-grep.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index 6a8b1e3a7..343eadd40 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -20,7 +20,9 @@ SYNOPSIS [-c | --count] [--all-match] [-q | --quiet] [--max-depth ] [--color[=] | --no-color] + [--break] [--heading] [-p | --show-function] [-A ] [-B ] [-C ] + [-W | --function-context] [-f ] [-e] [--and|--or|--not|(|)|-e ...] [ [--exclude-standard] [--cached | --no-index | --untracked] | ...] -- cgit v1.2.1 From 8ced9c90a28f6abc80dc5ad4cf7921c2322c0bb0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 26 Mar 2012 12:23:34 -0700 Subject: Git 1.7.9.5 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.9.5.txt | 23 +++++++++++++++++++++++ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 Documentation/RelNotes/1.7.9.5.txt diff --git a/Documentation/RelNotes/1.7.9.5.txt b/Documentation/RelNotes/1.7.9.5.txt new file mode 100644 index 000000000..95cc2bbf2 --- /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.txt b/Documentation/git.txt index 458cc076f..7ccb55d14 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], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 8ddc96d95..0a5135c05 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.9.4 +DEF_VER=v1.7.9.5 LF=' ' diff --git a/RelNotes b/RelNotes index f9f04dd38..d71b26d11 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.9.4.txt \ No newline at end of file +Documentation/RelNotes/1.7.9.5.txt \ No newline at end of file -- cgit v1.2.1