From 48bb914ed641fc0880d86b16cbb17c84769c320a Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 11 Mar 2011 00:52:08 -0500 Subject: doc: drop author/documentation sections from most pages The point of these sections is generally to: 1. Give credit where it is due. 2. Give the reader an idea of where to ask questions or file bug reports. But they don't do a good job of either case. For (1), they are out of date and incomplete. A much more accurate answer can be gotten through shortlog or blame. For (2), the correct contact point is generally git@vger, and even if you wanted to cc the contact point, the out-of-date and incomplete fields mean you're likely sending to somebody useless. So let's drop the fields entirely from all manpages except git(1) itself. We already point people to the mailing list for bug reports there, and we can update the Authors section to give credit to the major contributors and point to shortlog and blame for more information. Each page has a "This is part of git" footer, so people can follow that to the main git manpage. --- Documentation/git.txt | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'Documentation/git.txt') diff --git a/Documentation/git.txt b/Documentation/git.txt index 0c32d45248..4323843fe6 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -745,16 +745,10 @@ unmerged version of a file when a merge is in progress. Authors ------- -* git's founding father is Linus Torvalds . -* The current git nurse is Junio C Hamano . -* The git potty was written by Andreas Ericsson . -* General upbringing is handled by the git-list . - -Documentation --------------- -The documentation for git suite was started by David Greaves -, and later enhanced greatly by the -contributors on the git-list . +Git was started by Linus Torvalds, and is currently maintained by Junio +C Hamano. Numerous contributions have come from the git mailing list +. For a complete list of contributors, see +linkgit:git-shortlog[1] and linkgit:git-blame[1]. Reporting Bugs -------------- -- cgit v1.3 From d8f708f860095245c6973ba6b1ada366ce2d5bdf Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sat, 12 Mar 2011 22:00:38 -0500 Subject: docs: point git.txt author credits to git-scm.com There is a nice shortlog-ish output of the authors there. We also point people directly to shortlog, but of course they might be reading the documentation online or from a binary package of git. --- Documentation/git.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Documentation/git.txt') diff --git a/Documentation/git.txt b/Documentation/git.txt index 4323843fe6..5e57f6995a 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -747,8 +747,10 @@ Authors ------- Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the git mailing list -. For a complete list of contributors, see -linkgit:git-shortlog[1] and linkgit:git-blame[1]. +. For a more complete list of contributors, see +http://git-scm.com/about. If you have a clone of git.git itself, the +output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you +the authors for specific parts of the project. Reporting Bugs -------------- -- cgit v1.3 From cb35c0646d2b6a911f516ac2e45d2e23b038f646 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 3 Apr 2011 00:18:50 -0700 Subject: Update release notes As 1.7.4.3 has backmerged a handful of fixes from the master, drop these entries from 1.7.5 release notes. Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.5.txt | 40 ++++++++++++++++++---------------------- Documentation/git.txt | 4 +++- 2 files changed, 21 insertions(+), 23 deletions(-) (limited to 'Documentation/git.txt') diff --git a/Documentation/RelNotes/1.7.5.txt b/Documentation/RelNotes/1.7.5.txt index 648dbfd908..9c72084ff9 100644 --- a/Documentation/RelNotes/1.7.5.txt +++ b/Documentation/RelNotes/1.7.5.txt @@ -14,8 +14,9 @@ Updates since v1.7.4 * Update to more modern HP-UX port. - * The codebase is getting prepared for i18n/l10n; no translated/translatable - strings in the code yet. + * The codebase is getting prepared for i18n/l10n; no translated + strings nor translation mechanism in the code yet, but the strings + are being marked for l10n. * The bash completion script can now complete symmetric difference for "git diff" command, e.g. "git diff ...bra". @@ -27,10 +28,6 @@ Updates since v1.7.4 * "git apply -v" reports offset lines when the patch does not apply at the exact location recorded in the diff output. - * "git branch --track" (and "git checkout --track --branch") used to - allow setting up a random non-branch that does not make sense to follow - as the "upstream". The command correctly diagnoses it as an error. - * "git config" used to be also known as "git repo-config", but the old name is now officially deprecated. @@ -63,6 +60,12 @@ Updates since v1.7.4 * "git grep --no-index" did not honor pathspecs correctly, returning paths outside the specified area. + * "git init" learned the --separate-git-dir option to allow the git + directory for a new repository created elsewhere and linked via the + gitdir mechanism. This is primarily to help submodule support later + to switch between a branch of superproject that has the submodule + and another that does not. + * "git log" type commands now understand globbing pathspecs. You can say "git log -- '*.txt'" for example. @@ -71,6 +74,10 @@ Updates since v1.7.4 or highlighting equivalent changes that appear on both sides of a symmetric difference (e.g. "log --cherry A...B"). + * A lazy "git merge" that didn't say what to merge used to be an error. + When run on a branch that has an upstream defined, however, the command + now merges from the configured upstream. + * "git mergetool" learned how to drive "beyond compare 3" as well. * "git rerere forget" without pathspec used to forget all the saved @@ -104,17 +111,6 @@ Fixes since v1.7.4 All of the fixes in the v1.7.4.X maintenance series are included in this release, unless otherwise noted. - * "git apply" used to confuse lines updated by previous hunks as lines - that existed before when applying a hunk, contributing misapplication - of patches with offsets. - - * "git checkout $other_branch" silently removed untracked symbolic links - in the working tree that are in the way in order to check out paths - under it from the named branch (js/checkout-untracked-symlink). - - * "git diff --quiet" did not work very well with the "--diff-filter" - option (jc/maint-diff-q-filter). - * "git fetch" from a client that is mostly following the remote needlessly told all of its refs to the server for both sides to compute the set of objects that need to be transferred efficiently, @@ -128,13 +124,13 @@ release, unless otherwise noted. reachable from the refs in their common alternate object store, causing it to fetch unnecessary objects (jc/maint-fetch-alt). - * "git stash apply" reported the result of its operation by running - "git status" from the top-level of the working tree; it should (and - now does) run it from the user's working directory - (pk/stash-apply-status-relative). + * "git pull" into an empty branch should have behaved as if + fast-forwarding from emptiness to the version being pulled, with + the usual protection against overwriting untracked files (need to + cherry-pick 4b3ffe5). --- exec >/var/tmp/1 -O=v1.7.5-rc0 +O=v1.7.5-rc0-99-g8f84c95 echo O=$(git describe 'master') git shortlog --no-merges ^maint ^$O master diff --git a/Documentation/git.txt b/Documentation/git.txt index 5e57f6995a..78499db81b 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,11 @@ 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.4.1/git.html[documentation for release 1.7.4.1] +* link:v1.7.4.3/git.html[documentation for release 1.7.4.3] * release notes for + link:RelNotes/1.7.4.3.txt[1.7.4.3], + link:RelNotes/1.7.4.2.txt[1.7.4.2], link:RelNotes/1.7.4.1.txt[1.7.4.1], link:RelNotes/1.7.4.txt[1.7.4]. -- cgit v1.3 From 6be0559183ac0b40680df314748141d1bdf28e41 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 6 Apr 2011 10:57:32 -0700 Subject: Git 1.7.5-rc1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.5.txt | 20 +++++++++++--------- Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) (limited to 'Documentation/git.txt') diff --git a/Documentation/RelNotes/1.7.5.txt b/Documentation/RelNotes/1.7.5.txt index 9c72084ff9..b1b25133eb 100644 --- a/Documentation/RelNotes/1.7.5.txt +++ b/Documentation/RelNotes/1.7.5.txt @@ -54,6 +54,8 @@ Updates since v1.7.4 negotiation is done. This saves one HTTP RPC, reducing the overall latency for a trivial fetch. + * "git fetch" can be told to recursively fetch submodules on-demand. + * "git grep -f " learned to treat "-" as "read from the standard input stream". @@ -92,16 +94,16 @@ Updates since v1.7.4 "tracking" is used as the push.default semantics or there is no remote configured yet. + * A possible value to the "push.default" configuration variable, + 'tracking', gained a synonym that more naturally describes what it + does, 'upstream'. + * "git rerere" learned a new subcommand "remaining" that is similar to "status" and lists the paths that had conflicts which are known to rerere, but excludes the paths that have already been marked as resolved in the index from its output. "git mergetool" has been updated to use this facility. - * A possible value to the "push.default" configuration variable, - 'tracking', gained a synonym that more naturally describes what it - does, 'upstream'. - Also contains various documentation updates. @@ -124,13 +126,13 @@ release, unless otherwise noted. reachable from the refs in their common alternate object store, causing it to fetch unnecessary objects (jc/maint-fetch-alt). - * "git pull" into an empty branch should have behaved as if - fast-forwarding from emptiness to the version being pulled, with - the usual protection against overwriting untracked files (need to - cherry-pick 4b3ffe5). + * "git remote add --mirror" created a configuration that is suitable for + doing both a mirror fetch and a mirror push at the same time, which + made little sense. We now warn and require the command line to specify + either --mirror=fetch or --mirror=push. --- exec >/var/tmp/1 -O=v1.7.5-rc0-99-g8f84c95 +O=v1.7.5-rc1 echo O=$(git describe 'master') git shortlog --no-merges ^maint ^$O master diff --git a/Documentation/git.txt b/Documentation/git.txt index 78499db81b..7df49ea0d2 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.4.3/git.html[documentation for release 1.7.4.3] +* link:v1.7.4.4/git.html[documentation for release 1.7.4.4] * release notes for + link:RelNotes/1.7.4.4.txt[1.7.4.4], link:RelNotes/1.7.4.3.txt[1.7.4.3], link:RelNotes/1.7.4.2.txt[1.7.4.2], link:RelNotes/1.7.4.1.txt[1.7.4.1], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 35848df034..e9b2a47aff 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.5-rc0 +DEF_VER=v1.7.5-rc1 LF=' ' -- cgit v1.3