[ANNOUNCE] GIT 1.5.5

[ANNOUNCE] GIT 1.5.5

[Junio C Hamano]

The latest feature release GIT 1.5.5 is available at the usual
places:

  http://www.kernel.org/pub/software/scm/git/

  git-1.5.5.tar.{gz,bz2}			(tarball)
  git-htmldocs-1.5.5.tar.{gz,bz2}		(preformatted docs)
  git-manpages-1.5.5.tar.{gz,bz2}		(preformatted docs)
  RPMS/$arch/git-*-1.5.5-1.$arch.rpm	(RPM)

We kept this cycle just slightly over two months, as the previous 1.5.4
cycle was painfully tooooo long.


GIT v1.5.5 Release Notes
========================

Updates since v1.5.4
--------------------

(subsystems)

 * Comes with git-gui 0.10.1

(portability)

 * We shouldn't ask for BSD group ownership semantics by setting g+s bit
   on directories on older BSD systems that refuses chmod() by non root
   users.  BSD semantics is the default there anyway.

 * Bunch of portability improvement patches coming from an effort to port
   to Solaris has been applied.

(performance)

 * On platforms with suboptimal qsort(3) implementation, there
   is an option to use more reasonable substitute we ship with
   our software.

 * New configuration variable "pack.packsizelimit" can be used
   in place of command line option --max-pack-size.

 * "git fetch" over the native git protocol used to make a
   connection to find out the set of current remote refs and
   another to actually download the pack data.  We now use only
   one connection for these tasks.

 * "git commit" does not run lstat(2) more than necessary
   anymore.

(usability, bells and whistles)

 * Bash completion script (in contrib) are aware of more commands and
   options.

 * You can be warned when core.autocrlf conversion is applied in
   such a way that results in an irreversible conversion.

 * A catch-all "color.ui" configuration variable can be used to
   enable coloring of all color-capable commands, instead of
   individual ones such as "color.status" and "color.branch".

 * The commands refused to take absolute pathnames where they
   require pathnames relative to the work tree or the current
   subdirectory.  They now can take absolute pathnames in such a
   case as long as the pathnames do not refer outside of the
   work tree.  E.g. "git add $(pwd)/foo" now works.

 * Error messages used to be sent to stderr, only to get hidden,
   when $PAGER was in use.  They now are sent to stdout along
   with the command output to be shown in the $PAGER.

 * A pattern "foo/" in .gitignore file now matches a directory
   "foo".  Pattern "foo" also matches as before.

 * bash completion's prompt helper function can talk about
   operation in-progress (e.g. merge, rebase, etc.).

 * Configuration variables "url.<usethis>.insteadof = <otherurl>" can be
   used to tell "git-fetch" and "git-push" to use different URL than what
   is given from the command line.

 * "git add -i" behaves better even before you make an initial commit.

 * "git am" refused to run from a subdirectory without a good reason.

 * After "git apply --whitespace=fix" fixes whitespace errors in a patch,
   a line before the fix can appear as a context or preimage line in a
   later patch, causing the patch not to apply.  The command now knows to
   see through whitespace fixes done to context lines to successfully
   apply such a patch series.

 * "git branch" (and "git checkout -b") to branch from a local branch can
   optionally set "branch.<name>.merge" to mark the new branch to build on
   the other local branch, when "branch.autosetupmerge" is set to
   "always", or when passing the command line option "--track" (this option
   was ignored when branching from local branches).  By default, this does
   not happen when branching from a local branch.

 * "git checkout" to switch to a branch that has "branch.<name>.merge" set
   (i.e. marked to build on another branch) reports how much the branch
   and the other branch diverged.

 * When "git checkout" has to update a lot of paths, it used to be silent
   for 4 seconds before it showed any progress report.  It is now a bit
   more impatient and starts showing progress report early.

 * "git commit" learned a new hook "prepare-commit-msg" that can
   inspect what is going to be committed and prepare the commit
   log message template to be edited.

 * "git cvsimport" can now take more than one -M options.

 * "git describe" learned to limit the tags to be used for
   naming with --match option.

 * "git describe --contains" now barfs when the named commit
   cannot be described.

 * "git describe --exact-match" describes only commits that are tagged.

 * "git describe --long" describes a tagged commit as $tag-0-$sha1,
   instead of just showing the exact tagname.

 * "git describe" warns when using a tag whose name and path contradict
   with each other.

 * "git diff" learned "--relative" option to limit and output paths
   relative to the current directory when working in a subdirectory.

 * "git diff" learned "--dirstat" option to show birds-eye-summary of
   changes more concisely than "--diffstat".

 * "git format-patch" learned --cover-letter option to generate a cover
   letter template.

 * "git gc" learned --quiet option.

 * "git gc" now automatically prunes unreachable objects that are two
   weeks old or older.

 * "git gc --auto" can be disabled more easily by just setting gc.auto
   to zero.  It also tolerates more packfiles by default.

 * "git grep" now knows "--name-only" is a synonym for the "-l" option.

 * "git help <alias>" now reports "'git <alias>' is alias to <what>",
   instead of saying "No manual entry for git-<alias>".

 * "git help" can use different backends to show manual pages and this can
   be configured using "man.viewer" configuration.

 * "gitk" does not restore window position from $HOME/.gitk anymore (it
   still restores the size).

 * "git log --grep=<what>" learned "--fixed-strings" option to look for
   <what> without treating it as a regular expression.

 * "git gui" learned an auto-spell checking.

 * "git push <somewhere> HEAD" and "git push <somewhere> +HEAD" works as
   expected; they push the current branch (and only the current branch).
   In addition, HEAD can be written as the value of "remote.<there>.push"
   configuration variable.

 * When the configuration variable "pack.threads" is set to 0, "git
   repack" auto detects the number of CPUs and uses that many threads.

 * "git send-email" learned to prompt for passwords
   interactively.

 * "git send-email" learned an easier way to suppress CC
   recipients.

 * "git stash" learned "pop" command, that applies the latest stash and
   removes it from the stash, and "drop" command to discard the named
   stash entry.

 * "git submodule" learned a new subcommand "summary" to show the
   symmetric difference between the HEAD version and the work tree version
   of the submodule commits.

 * Various "git cvsimport", "git cvsexportcommit", "git cvsserver",
   "git svn" and "git p4" improvements.

(internal)

 * Duplicated code between git-help and git-instaweb that
   launches user's preferred browser has been refactored.

 * It is now easier to write test scripts that records known
   breakages.

 * "git checkout" is rewritten in C.

 * "git remote" is rewritten in C.

 * Two conflict hunks that are separated by a very short span of common
   lines are now coalesced into one larger hunk, to make the result easier
   to read.

 * Run-command API's use of file descriptors is documented clearer and
   is more consistent now.

 * diff output can be sent to FILE * that is different from stdout.  This
   will help reimplementing more things in C.

Fixes since v1.5.4
------------------

All of the fixes in v1.5.4 maintenance series are included in
this release, unless otherwise noted.

 * "git-http-push" did not allow deletion of remote ref with the usual
   "push <remote> :<branch>" syntax.

 * "git-rebase --abort" did not go back to the right location if
   "git-reset" was run during the "git-rebase" session.

 * "git imap-send" without setting imap.host did not error out but
   segfaulted.

What's in git.git (stable)

[Junio C Hamano]

* The 'master' branch has these since v1.5.5.

Frank Lichtenheld (4):
  var: Don't require to be in a git repository.
  Git.pm: Don't require a repository instance for config
  Git.pm: Don't require repository instance for ident
  send-email: Don't require to be called in a repository

Gerrit Pape (2):
  gitweb: fallback to system-wide config file if default config does not
    exist
  gitweb: fallback to system-wide config file (fixup)

Govind Salinas (1):
  pretty.c: add %x00 format specifier.

Jeff King (2):
  add--interactive: ignore mode change in 'p'atch command
  add--interactive: allow user to choose mode update

Junio C Hamano (4):
  Optimize rename detection for a huge diff
  t5300: add test for "unpack-objects --strict"
  unpack-objects: fix --strict handling
  rebase [--onto O] A B: omit needless checkout

Martin Koegler (3):
  unpack-objects: prevent writing of inconsistent objects
  receive-pack: allow using --strict mode for unpacking objects
  t5300: add test for "index-pack --strict"

Re: [ANNOUNCE] GIT 1.5.5

[Steffen Prohaska]

On Apr 9, 2008, at 8:51 AM, Junio C Hamano wrote:

> The latest feature release GIT 1.5.5 is available at the usual
> places:

The msysgit setup is now available at:

  http://code.google.com/p/msysgit/downloads/

	Steffen

What's in git.git (stable)

[Junio C Hamano]

* The 'maint' branch has these fixes since v1.5.5; perhaps v1.5.5.1 mid
  next week.

Björn Steinbrink (1):
  Fix section about backdating tags in the git-tag docs

Carlos Rica (2):
  Fix documentation syntax of optional arguments in short options.
  core-tutorial.txt: Fix showing the current behaviour.

Christian Couder (2):
  bisect: fix bad rev checking in "git bisect good"
  bisect: report bad rev better

Clifford Caoile (1):
  Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)

Daniel Barkalow (1):
  Fix config key miscount in url.*.insteadOf

Dirk Suesserott (1):
  Documentation/git-request-pull: Fixed a typo ("send" -> "end")

Jeff King (1):
  git-fetch: fix status output when not storing tracking ref

Johannes Sixt (1):
  Document option --only of git commit

Junio C Hamano (3):
  Document -w option to shortlog
  Documentation/git-submodule: typofix
  t7401: squelch garbage output

Michele Ballabio (1):
  revision.c: make --date-order overriddable

Pedro Melo (1):
  Force the medium pretty format on calls to git log

Ping Yin (1):
  git-submodule: Avoid 'fatal: cannot describe' message

René Scharfe (1):
  git-archive: ignore prefix when checking file attribute


* The 'master' branch has these since the last announcement
  in addition to the above.

Christian Couder (1):
  bisect: add "git bisect help" subcommand to get a long usage string

Johannes Sixt (1):
  builtin-commit.c: Remove a redundant assignment.

Junio C Hamano (1):
  git_config_bool_or_int()

What's in git.git (stable)

[Junio C Hamano]

As quite some fixes have accumulated on 'maint', I am planning to do
1.5.5.1 this Sunday with what is in 'maint', perhaps with the 'rebase: do
not munge commit log message' fix that is in 'master' tonight.

* The 'maint' branch has these fixes since the last announcement.

Alberto Bertogli (1):
  builtin-apply: Show a more descriptive error on failure when opening a
    patch

Christian Couder (2):
  bisect: squelch "fatal: ref HEAD not a symref" misleading message
  git-bisect: make "start", "good" and "skip" succeed or fail atomically

Jakub Narebski (1):
  gitweb: Fix 'history' view for deleted files with history

Jon Loeliger (1):
  Clarify and fix English in "git-rm" documentation

Jonas Fonseca (1):
  git-remote: reject adding remotes with invalid names

Junio C Hamano (2):
  git-am: minor cleanup
  am: POSIX portability fix

Linus Torvalds (2):
  Ignore leading empty lines while summarizing merges
  git-am: cope better with an empty Subject: line

Mark Levedahl (1):
  git-submodule - possibly use branch name to describe a module

Matthieu Moy (1):
  Document that WebDAV doesn't need git on the server, and works over SSL

Scott Collins (1):
  Clarify documentation of git-cvsserver, particularly in relation to
    git-shell

Shawn Bohrer (2):
  git clean: Don't automatically remove directories when run within
    subdirectory
  git clean: Add test to verify directories aren't removed with a prefix


* The 'master' branch has these since the last announcement
  in addition to the above.

Christian Couder (1):
  bisect: add "git bisect help" subcommand to get a long usage string

Johannes Sixt (1):
  builtin-commit.c: Remove a redundant assignment.

Junio C Hamano (3):
  git_config_bool_or_int()
  Fix git_config_bool_or_int
  rebase: do not munge commit log message

Stephan Beyer (1):
  builtin-apply.c: use git_config_string() to get apply_default_whitespace

What's in git.git (stable)

[Junio C Hamano]

Post 1.5.5 maintenance track is getting stable and more boring ;-).

* The 'maint' branch has these fixes since v1.5.5.1

Andy Parkins (1):
  post-receive-email: fix accidental removal of a trailing space in
    signature line

Ariel Badichi (2):
  copy.c: copy_fd - correctly report write errors
  archive.c: format_subst - fixed bogus argument to memchr

Brandon Casey (1):
  git-clone.txt: Adjust note to --shared for new pruning behavior of git-gc

Dmitry Potapov (1):
  git-gc --prune is deprecated

Gerrit Pape (1):
  diff-options.txt: document the new "--dirstat" option

Jeff King (5):
  Don't force imap.host to be set when imap.tunnel is set
  t5516: remove ambiguity test (1)
  doc/git-gc: add a note about what is collected
  push: allow unqualified dest refspecs to DWIM
  remote: create fetch config lines with '+'

Junio C Hamano (1):
  write-tree: properly detect failure to write tree objects

Matt Graham (1):
  Linked glossary from cvs-migration page

Matthew Ogilvie (1):
  gitattributes: Fix subdirectory attributes specified from root directory

Michael Weber (1):
  svn-git: Use binmode for reading/writing binary rev maps

Miklos Vajna (1):
  diff options documentation: refer to --diff-filter in --name-status

Sam Vilain (1):
  Amend git-push refspec documentation

Teemu Likonen (1):
  bash: Add completion for git diff --base --ours --theirs

Thomas Guyot-Sionnest (1):
  git-svn bug with blank commits and author file

martin f. krafft (2):
  Escape project name in regexp
  Escape project names before creating pathinfo URLs


* The 'master' branch has these since the last announcement
  in addition to the above.

Clifford Caoile (1):
  git.el: Set process-environment instead of invoking env

Dan McGee (2):
  completion: allow 'git remote' subcommand completion
  completion: remove use of dashed git commands

Heikki Orsila (1):
  Make core.sharedRepository more generic

Jeff King (1):
  git-remote: show all remotes with "git remote show"

Junio C Hamano (5):
  sha1-lookup: more memory efficient search in sorted list of SHA-1
  diff: make --dirstat binary-file safe
  sha1-lookup: make selection of 'middle' less aggressive
  log: teach "terminator" vs "separator" mode to "--pretty=format"
  First batch of post 1.5.5 updates

Matthias Kestenholz (1):
  Use color.ui variable in scripts too

Miklos Vajna (3):
  git-gc --auto: add pre-auto-gc hook
  Documentation/hooks: add pre-auto-gc hook
  contrib/hooks: add an example pre-auto-gc hook

Ping Yin (3):
  git-submodule summary: --for-status option
  builtin-status: submodule summary support
  builtin-status: Add tests for submodule summary

Rafael Garcia-Suarez (1):
  Spelling fixes in the gitweb documentation

What's in git.git (stable)

[Junio C Hamano]

* The 'maint' branch has these fixes since the last announcement.

Alex Riesen (2):
  Use "=" instead of "==" in condition as it is more portable
  Fix use after free() in builtin-fetch

Dan McGee (1):
  Remove 'header' from --signoff option description

Florian Ragwitz (1):
  filter-branch: Documentation fix.

Jeff King (3):
  fix reflog approxidate parsing bug
  cvsimport: always pass user data to "system" as a list
  checkout: don't rfc2047-encode oneline on detached HEAD

Junio C Hamano (2):
  clone: detect and fail on excess parameters
  fetch-pack: brown paper bag fix

Linus Torvalds (1):
  fetch-pack: do not stop traversing an already parsed commit


* The 'master' branch has these since the last announcement
  in addition to the above.

Adam Simpkins (2):
  Remove dead code: show_log() sep argument and diff_options.msg_sep
  log: print log entry terminator even if the message is empty

Alex Riesen (1):
  Use the modern syntax of git-diff-files in t2002-checkout-cache-u.sh

Bart Trojanowski (1):
  make git-status use a pager

Brandon Casey (1):
  filter-branch.sh: support nearly proper tag name filtering

Christian Couder (3):
  rev-parse: teach "--verify" to be quiet when using "-q" or "--quiet"
  rev-parse: fix --verify to error out when passed junk after a good rev
  Documentation: hooks: fix missing verb in pre-applypatch description

Gustaf Hendeby (2):
  git-svn: Make create-ignore use git add -f
  Documentation: Add create-ignore to git svn manual

Heikki Orsila (4):
  Document functions xmemdupz(), xread() and xwrite()
  Die for an early EOF in a file reading loop
  Make read_in_full() and write_in_full() consistent with xread() and
    xwrite()
  Cleanup xread() loops to use read_in_full()

Jeff King (2):
  git-fetch: always show status of non-tracking-ref fetches
  Documentation: point git-prune users to git-gc

Jon Loeliger (1):
  Add otherwise missing --strict option to unpack-objects summary.

Junio C Hamano (2):
  write_index(): optimize ce_smudge_racily_clean_entry() calls with
    CE_UPTODATE
  diff-files: mark an index entry we know is up-to-date as such

Jörg Sommer (1):
  post-merge: Add it's not executed if merge failed.

Lars Hjemli (7):
  Add platform-independent .git "symlink"
  Teach resolve_gitlink_ref() about the .git file
  Teach git-submodule.sh about the .git file
  Teach GIT-VERSION-GEN about the .git file
  git-branch: add support for --merged and --no-merged
  git-branch.txt: compare --contains, --merged and --no-merged
  Add tests for `branch --[no-]merged`

Liu Yubao (1):
  Documentation on --git-dir and --work-tree

Matthieu Moy (1):
  git-svn: detect and fail gracefully when dcommitting to a void

Miklos Vajna (2):
  git checkout: add -t alias for --track
  INSTALL: add a note about GNU interactive tools has been renamed

Paolo Bonzini (1):
  Add a remote.*.mirror configuration option

Richard Quirk (2):
  bash: Add completion for gitk --merge
  Documentation gitk: Describe what --merge does

Stephen R. van den Berg (1):
  git-svn: Same default as cvsimport when using --use-log-author

What's in git.git (stable)

[Junio C Hamano]

The largest change to 'master' in this round is Linus's case insensitivity
changes.  I wanted to get feedback and fixes (if needed) from case
insensitive folks while the topic was still in 'next', but it did not
happen, but this should at least not harm sane filesystems, so let's see
how it goes.

----------------------------------------------------------------

* The 'maint' branch has these fixes since the last announcement.

A Large Angry SCM (1):
  git-repack: re-enable parsing of -n command line option

Dustin Sallings (1):
  Documentation/config.txt: Mention branch.<name>.rebase applies to "git
    pull"

Ian Hilt (1):
  Documentation/git-describe.txt: make description more readable

Jeff King (1):
  doc: clarify definition of "update" for git-add -u

Johannes Sixt (1):
  wt-status.h: declare global variables as extern

Sitaram Chamarty (1):
  builtin-commit.c: add -u as short name for --untracked-files


* The 'master' branch has these since the last announcement
  in addition to the above.

Alex Riesen (1):
  Improve reporting of errors in config file routines

Brandon Casey (1):
  compat/fopen.c: avoid clobbering the system defined fopen macro

Bryan Donlan (10):
  git-rebase.sh: Fix --merge --abort failures when path contains whitespace
  config.c: Escape backslashes in section names properly
  git-send-email.perl: Handle shell metacharacters in $EDITOR properly
  test-lib.sh: Add a test_set_editor function to safely set $VISUAL
  Use test_set_editor in t9001-send-email.sh
  test-lib.sh: Fix some missing path quoting
  lib-git-svn.sh: Fix quoting issues with paths containing shell
    metacharacters
  Don't use the 'export NAME=value' in the test scripts.
  Fix tests breaking when checkout path contains shell metacharacters
  Rename the test trash directory to contain spaces.

Caio Marcelo de Oliveira Filho (1):
  git-format-patch: add --no-binary to omit binary changes in the patch.

Christian Couder (12):
  help: use man viewer path from "man.<tool>.path" config var
  documentation: help: add "man.<tool>.path" config variable
  help: use "man.<tool>.cmd" as custom man viewer command
  documentation: help: add info about "man.<tool>.cmd" config var
  documentation: web--browse: add a note about konqueror
  Documentation: rename "hooks.txt" to "githooks.txt" and make it a man
    page
  Documentation: improve "add", "pull" and "format-patch" examples
  Documentation: bisect: add a few "git bisect run" examples
  bisect: print an error message when "git rev-list --bisect-vars" fails
  rev-parse: add test script for "--verify"
  rev-parse: fix using "--default" with "--verify"
  rev-parse --verify: do not output anything on error

Dan McGee (1):
  Allow cherry-pick (and revert) to add signoff line

Daniel Barkalow (2):
  Make walker.fetch_ref() take a struct ref.
  Make ls-remote http://... list HEAD, like for git://...

Dustin Sallings (1):
  Allow tracking branches to set up rebase by default.

Eric Wong (1):
  git-svn: fix cloning of HTTP URLs with '+' in their path

Gerrit Pape (1):
  git-bisect.sh: don't accidentally override existing branch "bisect"

Gustaf Hendeby (1):
  Documentation/config.txt: Add git-gui options

Jakub Narebski (1):
  gitweb: Use feed link according to current view

Jeff King (7):
  add merge.renamelimit config option
  bump rename limit defaults
  diff: make "too many files" rename warning optional
  fix bsd shell negation
  t5000: tar portability fix
  clone: bsd shell portability fix
  filter-branch: fix variable export logic

Johannes Sixt (1):
  compat-util: avoid macro redefinition warning

Junio C Hamano (3):
  diff: a submodule not checked out is not modified
  diff-lib.c: rename check_work_tree_entity()
  is_racy_timestamp(): do not check timestamp for gitlinks

Krzysztof Kowalczyk (1):
  alloc_ref_from_str(): factor out a common pattern of alloc_ref from
    string

Linus Torvalds (12):
  Make unpack_trees_options bit flags actual bitfields
  Move name hashing functions into a file of its own
  Make "index_name_exists()" return the cache_entry it found
  Make hash_name_lookup able to do case-independent lookups
  Add 'core.ignorecase' option
  Make branch merging aware of underlying case-insensitive filsystems
  Make unpack-tree update removed files before any updated files
  When adding files to the index, add support for case-independent matches
  Make git-add behave more sensibly in a case-insensitive environment
  Optimize match_pathspec() to avoid fnmatch()
  Avoid some unnecessary lstat() calls
  Optimize symlink/directory detection

Mark Hills (1):
  Be more careful with objects directory permissions on clone

Miklos Vajna (3):
  git-format-patch: add a new format.cc configuration variable
  git-send-email: add a new sendemail.cc configuration variable
  Add tests for sendemail.cc configuration variable

Ping Yin (2):
  t4027: test diff for submodule with empty directory
  Add t7506 to test submodule related functions for git-status

SZEDER Gábor (5):
  doc: moved merge.* config variables into separate merge-config.txt
  merge, pull: introduce '--(no-)stat' option
  add 'merge.stat' config variable
  fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
  merge, pull: add '--(no-)log' command line option

Santi Béjar (3):
  Preparation to call determine_author_info from prepare_to_commit
  commit: Show author if different from committer
  commit: Show committer if automatic

Sebastian Schuberth (1):
  mergetool: Make ECMerge use the settings as specified by the user in the
    GUI

Steven Grimm (1):
  Add svn-compatible "blame" output format to git-svn

What's in git.git (stable)

[Junio C Hamano]

Quite a many topics have graduated to 'master' and hopefully we can tag
1.5.6-rc0 this weekend.  At about the same time I'll do 1.5.5.2 out of
'maint' branch, as it has accumulated quite a few fixes as well.

* The 'maint' branch has these fixes since the last announcement.

Heikki Orsila (1):
  Add missing "short" alternative to --date in rev-list-options.txt

Jeff King (2):
  doc/git-daemon: s/uploadarchive/uploadarch/
  git-am: fix typo in usage message

Johannes Sixt (1):
  rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref

Jon Loeliger (2):
  git-filter-branch: Clarify file removal example.
  git-show.txt: Not very stubby these days.

Shawn O. Pearce (1):
  Clarify repack -n documentation


* The 'master' branch has these since the last announcement
  in addition to the above.

Adam Simpkins (4):
  revision API: split parent rewriting and parent printing options
  Add history graph API
  log and rev-list: add --graph option
  graph API: eliminate unnecessary indentation

Alex Riesen (7):
  Make the exit code of add_file_to_index actually useful
  Extend interface of add_files_to_cache to allow ignore indexing errors
  Add --ignore-errors to git-add to allow it to skip files with read errors
  Add a test for git-add --ignore-errors
  Add a config option to ignore errors for git-add
  Ensure that a test is run in the trash directory
  Fix t3701 if core.filemode disabled

Anders Waldenborg (1):
  gitweb: Convert string to internal form before chopping in chop_str

Brandon Casey (4):
  repack: modify behavior of -A option to leave unreferenced objects
    unpacked
  git-gc: always use -A when manually repacking
  builtin-gc.c: deprecate --prune, it now really has no effect
  t/Makefile: "trash" directory was renamed recently

Chris Frey (2):
  Documentation/git-prune.txt: document unpacked logic
  Documentation/git-repack.txt: document new -A behaviour

Chris Parsons (1):
  Updated status to show 'Not currently on any branch' in red

Christian Couder (1):
  Documentation: rev-parse: add a few "--verify" and "--default" examples

Christian Stimming (3):
  git-gui: Update German translation
  gitk: Update German translation
  gitk: German translation again updated

Dmitry Potapov (1):
  git-init: autodetect core.ignorecase

Dustin Sallings (1):
  Allow tracking branches to set up rebase by default.

Gerrit Pape (1):
  gitk: Makefile/install: force permissions when installing files and dirs

Gustaf Hendeby (1):
  Documentation: Add missing git svn commands

Heikki Orsila (1):
  Add log.date config variable

Horst H. von Brand (1):
  Fix recipient santitization

Imran M Yousuf (1):
  Use '-f' option to point to the .gitmodules file

Jeff King (2):
  send-email: specify content-type of --compose body
  send-email: rfc2047-quote subject lines with non-ascii characters

Johannes Schindelin (2):
  submodule update: add convenience option --init
  pull --rebase: exit early when the working directory is dirty

Johannes Sixt (1):
  git-gui: Report less precise object estimates for database compression

Lars Hjemli (1):
  revision.c: really honor --first-parent

Marcel Koeppen (2):
  Replace in-place sed in t7502-commit
  Fix prepare-commit-msg hook and replace in-place sed

Michele Ballabio (1):
  gitk: Disable "Reset %s branch to here" when on a detached head

Mike Ralphson (1):
  Makefile: update the default build options for AIX

Miklos Vajna (2):
  git-fast-import: rename cmd_*() functions to parse_*()
  git-merge: exclude unnecessary options from OPTIONS_SPEC

Nicolas Pitre (9):
  pack-objects: small cleanup
  pack-objects: remove some double negative logic
  pack-objects: simplify the condition associated with --all-progress
  pack-objects: clean up write_object() a bit
  pack-objects: move compression code in a separate function
  pack-objects: allow for early delta deflating
  pack-objects: fix early eviction for max depth delta objects
  add a force_object_loose() function
  let pack-objects do the writing of unreachable objects as loose objects

Paolo Bonzini (1):
  add special "matching refs" refspec

Paul Mackerras (37):
  gitk: Use git log without --topo-order and reorganize the commits
    ourselves
  gitk: Fix bug in assigning row numbers to arcs
  gitk: Fix bug in parsing multiple revision arguments
  gitk: Compute row numbers and order tokens lazily
  gitk: Fix a couple of bugs
  gitk: Fix more bugs resulting in Tcl "no such element in array" errors
  gitk: More bug fixes and cleanups
  gitk: Implement date mode in the new framework
  gitk: Fix another collection of bugs
  gitk: Don't try to show local changes from a head that isn't shown
  gitk: Keep the same commits visible as other commits come in
  gitk: Fix some corner cases in the targetid/targetrow stuff
  gitk: Fix a couple of bugs in the find function
  gitk: Fix potential bug with fake commit IDs in renumbervarc
  gitk: Index [fnvr]highlights by id rather than row
  gitk: Fix handling of flag arguments
  gitk: Fix a bug in make_disporder
  gitk: Select head of current branch by default
  gitk: Select something appropriate on cherry-pick, branch reset and
    checkout
  gitk: Fix bug where editing an existing view would cause an infinite loop
  gitk: Fix bug causing Tcl error when no commits are selected
  gitk: Fix cherry-picking to insert a real row not a fake row
  gitk: Cope better with getting commits that we have already seen
  gitk: Fix bug where arcs could get lost
  gitk: Handle updating with path limiting better
  gitk: Fix problems with target row stuff
  gitk: Don't filter view arguments through git rev-parse
  gitk: Correct a few strings and comments to say "git log"
  gitk: Fix some corner cases in computing vrowmod and displayorder
  gitk: Avoid a crash in selectline if commitinfo($id) isn't set
  gitk: Fix problem with target row not being in scroll region
  gitk: Reorganize processing of arguments for git log
  gitk: Fix handling of tree file list with special chars in names
  gitk: Make updates go faster
  gitk: Synchronize highlighting in file view for 'f' and 'b' commands
  gitk: Show current row number and total number of rows
  gitk: Add a progress bar for checking out a head

Peter Karlsson (1):
  gitk: Initial Swedish translation.

Santiago Gala (1):
  gitk: Spanish translation of gitk

Shawn O. Pearce (3):
  git-gui: Don't use '$$cr master' with aspell earlier than 0.60
  git-gui: Setup branch.remote,merge for shorthand git-pull
  git-gui: Delete branches with 'git branch -D' to clear config

Steffen Prohaska (4):
  t0050: Test autodetect core.ignorecase
  t0050: Set core.ignorecase case to activate case insensitivity
  t0050: Add test for case insensitive add
  t0050: Fix merge test on case sensitive file systems

Stephen R. van den Berg (1):
  Simplify and fix --first-parent implementation

Teemu Likonen (1):
  Documentation/git-web--browse.txt: fix small typo

Thomas Arcila (1):
  gitk: Allow users to view diffs in external diff viewer

Trent Piepho (1):
  cvsexportcommit: Create config option for CVS dir

What's in git.git (stable)

[Junio C Hamano]

[jc: I wrote this a few days ago but did not send it out]

* The 'master' branch has these since 1.5.6-rc0.

Christian Couder (1):
  bisect: use "$GIT_DIR/BISECT_START" to check if we are bisecting

Dmitry V. Levin (1):
  builtin-fetch.c (store_updated_refs): Honor update_local_ref() return
    value

Gerrit Pape (2):
  Documentation/git-bundle.txt: fix synopsis
  commit --interactive: properly update the index before commiting

Jeff King (1):
  clone: make sure we support the transport type

Johannes Schindelin (1):
  hg-to-git: add --verbose option

Johannes Sixt (2):
  t5700-clone-reference: Quote $U
  Revert "filter-branch: subdirectory filter needs --full-history"

Junio C Hamano (19):
  tests: do not use implicit "git diff --no-index"
  diff-files: do not play --no-index games
  "git diff": do not ignore index without --no-index
  Update draft release notes for 1.5.6
  log --graph: do not accept log --graphbogus
  log --pretty: do not accept bogus "--prettyshort"
  Release Notes for 1.5.5.2
  Documentation/git.txt: link to 1.5.5.2 documentation.
  Makefile: fix dependency on wt-status.h
  show-branch --current: do not barf on detached HEAD
  git-diff: allow  --no-index semantics a bit more
  git diff --no-index: default to page like other diff frontends
  GIT 1.5.5.3
  t5100: Avoid filename "nul"
  Git::cat_blob: allow using an empty blob to fix git-svn breakage
  fix sha1_pack_index_name()
  Manual subsection to refer to other pages is SEE ALSO
  Documentation: git-cherry uses git-patch-id
  "git checkout -- paths..." should error out when paths cannot be written

Karl Hasselström (1):
  Add some tests for git update-ref -d

Lea Wiemann (1):
  gitweb: only display "next" links in logs if there is a next page

Michele Ballabio (1):
  Documentation: fix graph in git-rev-parse.txt

Pieter de Bie (1):
  builtin-fast-export: Only output a single parent per line

Shawn O. Pearce (5):
  git-gui: Add a --trace command line option
  git-gui: Handle workdir detection when CYGWIN=nowinsymlinks
  Don't diff empty tree on branch creation in paranoid update hook
  Don't load missing ACL files in paranoid update hook
  Ignore no-op changes in paranoid update hook

Twiinz (1):
  git-gui: Vertically align textboxes with labels

What's in git.git (stable)

[Junio C Hamano]

* The 'master' branch has these since the last announcement.  I'll tag
  -rc1 in a few days.  Hopefully we can make this cycle much shorter than
  the painfully long one we had for 1.5.5.

Adam Simpkins (2):
  graph API: improve display of merge commits
  graph API: avoid printing unnecessary padding before some octopus merges

Christian Couder (1):
  Documentation: convert "glossary" and "core-tutorial" to man pages

Christian Engwer (1):
  git-svn fails in prop_walk if $self->{path} is not empty

Jakub Narebski (1):
  gitweb: Remove gitweb/test/ directory

Jamis Buck (1):
  git-reset: honor -q and do not show progress message

John J. Franey (1):
  Clarify description of <repository> argument to pull/fetch for naming
    remotes.

Junio C Hamano (4):
  checkout: make reset_clean_to_new() not die by itself
  checkout: consolidate reset_{to_new,clean_to_new}()
  unpack_trees(): allow callers to differentiate worktree errors from merge
    errors
  checkout: "best effort" checkout

Karl Hasselström (1):
  Fix path duplication in git svn commit-diff

Lea Wiemann (4):
  t/test-lib.sh: resolve symlinks in working directory, for pathname
    comparisons
  Git.pm: fix documentation of hash_object
  glossary: improve a few links
  Git.pm: fix return value of config method

Linus Torvalds (2):
  Make pack creation always fsync() the result
  Remove now unnecessary 'sync()' calls

Luciano Rocha (1):
  git-init: accept --bare option

Marius Storm-Olsen (2):
  Clearify the documentation for core.ignoreStat
  Add shortcut in refresh_cache_ent() for marked entries.

Miklos Vajna (1):
  Revision walking documentation: document most important functions

Nicolas Pitre (1):
  make verify-pack a bit more useful with bad packs

Paolo Bonzini (1):
  rollback lock files on more signals than just SIGINT

Seth Falcon (1):
  Add a --dry-run option to git-svn rebase

Shawn O. Pearce (3):
  Remove unused remote_prefix member in builtin-remote
  Make "git-remote prune" delete refs according to fetch specs
  Make "git-remote rm" delete refs acccording to fetch specs

Stephan Beyer (2):
  Add test cases for git-am
  Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh

What's in git.git (stable)

[Junio C Hamano]

Since v1.5.6-rc2 there are handful more fixes.  More important ones among
them are:

 - "git-remote prune -n" fix (Olivier Marin)

 - "git-log --graph --first-parent" fix (Adam Simpkins)

 - "git-fast-export" fix for multi-root repository (Shawn)

 - "gitk" works better with detached HEAD (Paul Mackerras)

Time for -rc3 this weekend and hopefully the final sometime next week.

---
* The 'maint' branch has these fixes since the last announcement.

Björn Steinbrink (1):
  name-rev: Fix segmentation fault when using --all

Fred Maranhão (1):
  fix typo in tutorial

Johannes Sixt (1):
  Remove exec bit from builtin-fast-export.c

Junio C Hamano (1):
  GIT 1.5.5.4

Lea Wiemann (1):
  git-for-each-ref.txt: minor improvements

Michael Dressel (1):
  describe: match pattern for lightweight tags too

Miklos Vajna (1):
  git-read-tree: document -v option.


* The 'master' branch has these since the last announcement
  in addition to the above.

Adam Simpkins (2):
  graph API: fix "git log --graph --first-parent"
  git log --graph: print '*' for all commits, including merges

Alex Riesen (1):
  Fix t5516 on cygwin: it does not like double slashes at the beginning of
    a path

Ask Bjørn Hansen (2):
  gitweb setup instruction: rewrite HEAD and root as well
  send-email: Allow the envelope sender to be set via configuration

Boyd Lynn Gerber (2):
  progress.c: avoid use of dynamic-sized array
  Port to 12 other Platforms.

Chris Ridd (1):
  Improve sed portability

Christian Couder (2):
  documentation: convert "diffcore" and "repository-layout" to man pages
  documentation: move git(7) to git(1)

Daniel Barkalow (1):
  Use nonrelative paths instead of absolute paths for cloned repositories

Dirk Suesserott (1):
  Documentation/git-mailsplit: Enhanced description of -o option

Geoffrey Irving (1):
  doc: adding gitman.info and *.texi to .gitignore

Jakub Narebski (2):
  gitweb: Fix "next" link on bottom of page
  gitweb: Add charset info to "raw" output of 'text/plain' blobs

Jeff King (2):
  Fix "git clone http://$URL" to check out the worktree when asked
  document --pretty=tformat: option

Johannes Schindelin (1):
  merge-recursive: respect core.autocrlf when writing out the result

Johannes Sixt (2):
  rebase --interactive: Compute upstream SHA1 before switching branches
  make_nonrelative_path: Use is_absolute_path()

Junio C Hamano (12):
  commit: drop duplicated parents
  GIT v1.5.6-rc1
  t7502: do not globally unset GIT_COMMITTER_* environment variables
  t7502: tighten loosely written test sequence
  Documentation: git-log cannot use rev-list specific options
  t7502: honor SHELL_PATH
  GIT 1.5.6-rc2
  http-push.c: remove duplicated code
  "remote prune": be quiet when there is nothing to prune
  Documentation/git-pull.txt: Use more standard [NOTE] markup
  Documentation: exclude @pxref{[REMOTES]} from texinfo intermediate output
  user-manual: describe how higher stages are set during a merge

Karl Hasselström (1):
  Revert "git.el: Set process-environment instead of invoking env"

Kevin Ballard (1):
  Documentation/git-filter-branch.txt: Fix description of --commit-filter

Lea Wiemann (5):
  cat-file --batch: flush stdout also when objects are missing
  t1006-cat-file.sh: typo
  cat-file --batch / --batch-check: do not exit if hashes are missing
  Documentation/git-cat-file.txt: add missing line break
  t/.gitattributes: only ignore whitespace errors in test files

Linus Torvalds (1):
  Consolidate SHA1 object file close

Marius Storm-Olsen (1):
  Add testcase for merging in a CRLF repo

Mikael Magnusson (1):
  Typo in RelNotes.

Miklos Vajna (3):
  Strbuf documentation: document most functions
  Remove unused code in parse_commit_buffer()
  git-rebase -i: mention the short command aliases in the todo list

Olivier Marin (4):
  remote show: fix the -n option
  builtin-remote: split show_or_prune() in two separate functions
  remote prune: print the list of pruned branches
  remote show: list tracked remote branches with -n

Paul Mackerras (1):
  gitk: Handle detached heads better

Philippe Bruhat (BooK) (1):
  git-cvsimport: do not fail when CVSROOT is /

Pieter de Bie (1):
  git-send-email: allow whitespace in addressee list

Shawn O. Pearce (1):
  fast-export: Correctly generate initial commits with no parents

Stephan Beyer (6):
  git-commit.txt: Correct option alternatives
  git-commit.txt: Add missing long/short options
  Docs: Use "-l::\n--long\n" format in OPTIONS sections
  Docs: add some long/short options
  git-describe.txt: document --always
  git-name-rev.txt: document --no-undefined and --always

Teemu Likonen (1):
  Print info about "git help COMMAND" on git's main usage pages

What's in git.git (stable)

[Junio C Hamano]

I am sending this out just as the final minute preview before 1.5.6 final,
hopefully tomorrow night.

* The 'maint' branch has these fixes since the last announcement.

Junio C Hamano (1):
  diff.c: fix emit_line() again not to add extra line

SZEDER Gábor (1):
  diff: reset color before printing newline


* The 'master' branch has these since the last announcement
  in addition to the above.

Alejandro Mery (1):
  git-am: head -1 is obsolete and doesn't work on some new systems

Avery Pennarun (2):
  git-svn: don't append extra newlines at the end of commit messages.
  git-svn: test that extra blank lines aren't inserted in commit messages.

Christian Couder (2):
  documentation: bisect: remove bits talking about a bisection branch
  Documentation: RelNotes-1.5.6: talk about renamed HTML files

Flavio Poletti (1):
  git-instaweb: improve auto-discovery of httpd and call conventions.

Jakub Narebski (2):
  gitweb: Make it work with $GIT containing spaces
  Use 'trash directory' thoroughly in t/test-lib.sh

Johan Herland (3):
  cpio is no longer used by git-clone
  Consistency: Use "libcurl" instead of "cURL library" and "curl"
  The "curl" executable is no longer required

Junio C Hamano (8):
  t4126: fix test that happened to work due to timing
  sha1_file.c: dead code removal
  GIT 1.5.6-rc3
  Makefile: update check-docs target
  Update RPM spec to drop curl executable requirement
  create_tempfile: make sure that leading directories can be accessible by
    peers
  sha1_file.c: simplify parse_pack_index()
  builtin-rerere: fix a small leak

Lea Wiemann (2):
  gitweb: quote commands properly when calling the shell
  gitweb: remove unused parse_ref method

Linus Torvalds (4):
  Avoid cross-directory renames and linking on object creation
  Make loose object file reading more careful
  Simplify and rename find_sha1_file()
  write_loose_object: don't bother trying to read an old object

Mark Levedahl (1):
  git-submodule - Fix errors regarding resolve_relative_url

Mike Hommey (1):
  Don't allocate too much memory in quote_ref_url

Miklos Vajna (2):
  run-command documentation: fix "memset()" parameter
  path-list documentation: document all functions and data structures

Olivier Marin (1):
  Fix approxidate("never") to always return 0

Pierre Habouzit (1):
  Make git reflog expire honour core.sharedRepository.

René Scharfe (1):
  Ignore .gitattributes in bare repositories

SZEDER Gábor (2):
  git add: add long equivalents of '-u' and '-f' options
  completion: add more 'git add' options

Re: What's in git.git (stable)

[Jeff King]

On Wed, Jun 18, 2008 at 12:32:05AM -0700, Junio C Hamano wrote:

> I am sending this out just as the final minute preview before 1.5.6 final,
> hopefully tomorrow night.

I sent out a code cleanup for remote.c yesterday that fixes a segfault:

  http://mid.gmane.org/20080616161502.GA7219@sigill.intra.peff.net

I am OK if it doesn't make it in to 1.5.6, but if not, then we should at
least apply the very safe one-liner that prevents the segfault. That
patch is below.

-- >8 --
fix segfault with "git push bogus:bogus"

We try to guess the type of the dst half of the refspec
based on the src half. If the src half is bogus, we ended up
dereferencing NULL.
---
 remote.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/remote.c b/remote.c
index 91e3b11..fd8c71a 100644
--- a/remote.c
+++ b/remote.c
@@ -920,7 +920,8 @@ static int match_explicit(struct ref *src, struct ref *dst,
 	case 0:
 		if (!memcmp(dst_value, "refs/", 5))
 			matched_dst = make_linked_ref(dst_value, dst_tail);
-		else if((dst_guess = guess_ref(dst_value, matched_src)))
+		else if(matched_src &&
+			(dst_guess = guess_ref(dst_value, matched_src)))
 			matched_dst = make_linked_ref(dst_guess, dst_tail);
 		else
 			error("unable to push to unqualified destination: %s\n"
-- 
1.5.6.rc3.160.g2a3c9

What's in git.git (stable)

[Junio C Hamano]

* The 'maint' branch has now preparing for 1.5.6.1, with these noncritical
  fixes.

Brandon Casey (2):
  git-merge.sh: fix typo in usage message: sucesses --> succeeds
  t7502-commit.sh: test_must_fail doesn't work with inline environment
    variables

Dan McGee (1):
  completion: add --graph to log command completion

Jan Krüger (1):
  Documentation: fix formatting in git-svn


* The 'master' branch has these since the last announcement
  in addition to the above.  Not much to see here (yet).

Cristian Peraferrer (1):
  Print errno upon failure to open the COMMIT_EDITMSG file

Jakub Narebski (1):
  t/README: Add 'Skipping Tests' section below 'Running Tests'

Lea Wiemann (1):
  test-lib.sh: add --long-tests option

Lukas Sandström (1):
  Add a helper script to send patches with Mozilla Thunderbird

Shawn O. Pearce (1):
  Correct documentation for git-push --mirror

Teemu Likonen (2):
  bash: Add more option completions for 'git log'
  Add target "install-html" the the top level Makefile

What's in git.git (stable)

[Junio C Hamano]

There are a few more fixes destined for maint, being tested in next first.

* The 'maint' branch has these fixes since the last announcement.

Michele Ballabio (1):
  parse-options.c: fix documentation syntax of optional arguments

Stephan Beyer (3):
  api-builtin.txt: update and fix typo
  api-parse-options.txt: Introduce documentation for parse options API
  Extend parse-options test suite


* The 'master' branch has these since the last announcement
  in addition to the above.

Jakub Narebski (2):
  gitweb: Separate filling list of projects info
  gitweb: Separate generating 'sort by' table header

Jeff King (5):
  fix whitespace violations in test scripts
  mask necessary whitespace policy violations in test scripts
  avoid whitespace on empty line in automatic usage message
  avoid trailing whitespace in zero-change diffstat lines
  enable whitespace checking of test scripts

Junio C Hamano (1):
  diff -c/--cc: do not include uninteresting deletion before leading
    context

Karl Hasselström (2):
  Clean up builtin-update-ref's option parsing
  Make old sha1 optional with git update-ref -d

Linus Torvalds (3):
  racy-git: an empty blob has a fixed object name
  Make git_dir a path relative to work_tree in setup_work_tree()
  Shrink the git binary a bit by avoiding unnecessary inline functions

Marius Storm-Olsen (3):
  Add an optional <mode> argument to commit/status -u|--untracked-files
    option
  Add argument 'no' commit/status option -u|--untracked-files
  Add configuration option for default untracked files mode

Nanako Shiraishi (2):
  environment.c: remove unused function
  config.c: make git_env_bool() static

Pieter de Bie (1):
  builtin-fast-export: Add importing and exporting of revision marks

Rafael Garcia-Suarez (1):
  gitweb: remove git_blame and rename git_blame2 to git_blame

René Scharfe (1):
  Teach new attribute 'export-ignore' to git-archive

What's in git.git (stable)

[Junio C Hamano]

We'd need a maint release soon to push out the mkstemp() breakage but not
tonight.  There are a handful changes that are in 'master' and 'next' that
need backport/backmerge before 1.5.6.1 happens.

* The 'maint' branch has these fixes since the last announcement.

Jan Krüger (1):
  git-svn: make rebuild respect rewriteRoot option

Patrick Higgins (1):
  Workaround for AIX mkstemp()


* The 'master' branch has these since the last announcement
  in addition to the above.

Jeff King (1):
  clone: create intermediate directories of destination repo

Junio C Hamano (2):
  pre-rebase hook update
  Ship sample hooks with .sample suffix

Michele Ballabio (1):
  t9301-fast-export.sh: Remove debug line

Nicolas Pitre (8):
  call init_pack_revindex() lazily
  implement some resilience against pack corruptions
  test case for pack resilience against corruptions
  refactor pack structure allocation
  optimize verify-pack a bit
  move show_pack_info() where it belongs
  verify-pack: check packed object CRC when using index version 2
  verify-pack: test for detection of index v2 object CRC mismatch

What's in git.git (stable)

[Junio C Hamano]

There are a few fixes on 'maint', in addition to futureproofing of "git
shell" so that eventually we can update the ssh clients to ask for server
side programs using "git upload-pack" syntax without a dash between "git"
and the subcommand name.

Many of the medimu size items for 1.6.0 have been merged to 'master'.  The
port to MinGW series will also be merged shortly.

----------------------------------------------------------------

GIT v1.6.0 Release Notes (draft)
================================

User visible changes
--------------------

With the default Makefile settings, most of the programs are now
installed outside your $PATH, except for "git", "gitk", "git-gui" and
some server side programs that need to be accessible for technical
reasons.  Invoking a git subcommand as "git-xyzzy" from the command
line has been deprecated since early 2006 (and officially announced in
1.5.4 release notes); use of them from your scripts after adding
output from "git --exec-path" to the $PATH is still supported in this
release, but users are again strongly encouraged to adjust their
scripts to use "git xyzzy" form, as we will stop installing
"git-xyzzy" hardlinks for built-in commands in later releases.

Source changes needed for porting to MinGW environment are now all in the
main git.git codebase.

By default, packfiles created with this version uses delta-base-offset
encoding introduced in v1.4.4.  Pack idx files are using version 2 that
allows larger packs and added robustness thanks to its CRC checking,
introduced in v1.5.2.


Updates since v1.5.6
--------------------

(subsystems)

* git-p4 in contrib learned "allowSubmit" configuration to control on
  which branch to allow "submit" subcommand.

(portability)

* Sample hook scripts shipped in templates/ are now suffixed with
  *.sample.  We used to prevent them from triggering by default by
  relying on the fact that we install them as unexecutable, but on
  some filesystems this approach does not work.  Instead of running
  "chmod +x" on them, the users who want to activate these samples
  as-is can now rename them dropping *.sample suffix.

* perl's in-place edit (-i) does not work well without backup files on Windows;
  some tests are rewritten to cope with this.

(documentation)

* Updated howto/update-hook-example

* Got rid of usage of "git-foo" from the tutorial.

* Disambiguating "--" between revs and paths is finally documented.

(performance, robustness, sanity etc.)

* even more documentation pages are now accessible via "man" and "git help".

* reduced excessive inlining to shrink size of the "git" binary.

* verify-pack checks the object CRC when using version 2 idx files.

* When an object is corrupt in a pack, the object became unusable even
  when the same object is available in a loose form,  We now try harder to
  fall back to these redundant objects when able.  In particular, "git
  repack -a -f" can be used to fix such a corruption as long as necessary
  objects are available.

* git-clone does not create refs in loose form anymore (it behaves as
  if you immediately ran git-pack-refs after cloning).  This will help
  repositories with insanely large number of refs.

* core.fsyncobjectfiles configuration can be used to ensure that the loose
  objects created will be fsync'ed (this is only useful on filesystems
  that does not order data writes properly).

* "git commit-tree" plumbing can make Octopus with more than 16 parents.
  "git commit" has been capable of this for quite some time.

(usability, bells and whistles)

* git-apply can handle a patch that touches the same path more than once
  much better than before.

* git-apply can be told not to trust the line counts recorded in the input
  patch but recount, with the new --recount option.

* git-archive can be told to omit certain paths from its output using
  export-ignore attributes.

* git-clone can clone from a remote whose URL would be rewritten by
  configuration stored in $HOME/.gitconfig now.

* git-diff --check now checks leftover merge conflict markers.

* When remote side used to have branch 'foo' and git-fetch finds that now
  it has branch 'foo/bar', it refuses to lose the existing remote tracking
  branch and its reflog.  The error message has been improved to suggest
  pruning the remote if the user wants to proceed and get the latest set
  of branches from the remote, including such 'foo/bar'.

* fast-export learned to export and import marks file; this can be used to
  interface with fast-import incrementally.

* Original SHA-1 value for "update-ref -d" is optional now.

* git-send-mail can talk not just over SSL but over TLS now.

* You can tell "git status -u" to even more aggressively omit checking
  untracked files with --untracked-files=no.

* Error codes from gitweb are made more descriptive where possible, rather
  than "403 forbidden" as we used to issue everywhere.

(internal)


Fixes since v1.5.6
------------------

All of the fixes in v1.5.6 maintenance series are included in
this release, unless otherwise noted.

 * diff -c/--cc showed unnecessary "deletion" lines at the context
   boundary (needs backmerge to maint).

 * "git-clone <src> <dst>" did not create leading directories for <dst>
   like the scripted version used to do (needs backport to maint).


----------------------------------------------------------------

* The 'maint' branch has these fixes since v1.5.6.1.

Avery Pennarun (1):
  git-svn: avoid filling up the disk with temp files.

Björn Steinbrink (1):
  git cat-file: Fix memory leak in batch mode

Eric Wong (1):
  git-svn: don't sanitize remote names in config

Jeff King (1):
  doc/rev-parse: clarify reflog vs --until for specifying revisions

Jochen Voss (1):
  avoid off-by-one error in run_upload_archive

Joey Hess (1):
  fix git config example syntax

Junio C Hamano (5):
  diff --check: do not discard error status upon seeing a good line
  git-shell: accept "git foo" form
  GIT 1.5.4.6
  GIT 1.5.5.5
  Start draft release notes for 1.5.6.2

Thomas Rast (1):
  Fix 'git show' on signed tag of signed tag of commit


* The 'master' branch has these since the last announcement
  in addition to the above.

Alex Riesen (1):
  Fix use of "perl -i" on Windows

Brian Gernhardt (2):
  Fix t4017-diff-retval for white-space from wc
  Add test results directory to t/.gitignore

Christian Couder (1):
  help: check early if we have a command, if not try a documentation topic

Dmitry Potapov (2):
  update-hook-example: optionally allow non-fast-forward
  shrink git-shell by avoiding redundant dependencies

Don Zickus (1):
  git-apply: handle a patch that touches the same path more than once
    better

Jeff King (3):
  improve for-each-ref test script
  fetch: report local storage errors in status table
  fetch: give a hint to the user when local refs fail to update

Jing Xue (1):
  Add 'git-p4.allowSubmit' to git-p4

Johan Herland (4):
  Incorporate fetched packs in future object traversal
  Move pack_refs() and friends into libgit
  Prepare testsuite for a "git clone" that packs refs
  Teach "git clone" to pack refs

Johannes Schindelin (4):
  clone: respect url.insteadOf setting in global configs
  commit-tree: lift completely arbitrary limit of 16 parents
  Allow git-apply to recount the lines in a hunk (AKA recountdiff)
  clone: respect the settings in $HOME/.gitconfig and /etc/gitconfig

Jonathan Nieder (7):
  Documentation: fix links to tutorials and other new manual pages
  whitespace fix in Documentation/git-repack.txt
  Documentation: complicate example of "man git-command"
  git-daemon(1): don't assume git-daemon is in /usr/bin
  Documentation: prepare to be consistent about "git-" versus "git "
  Documentation: be consistent about "git-" versus "git "
  Documentation formatting and cleanup

Junio C Hamano (15):
  git-shell: accept "git foo" form
  Prepare execv_git_cmd() for removal of builtins from the filesystem
  Keep some git-* programs in $(bindir)
  Allow "git-reset path" when unambiguous
  Start draft release notes for 1.6.0
  diff --check: explain why we do not care whether old side is binary
  check_and_emit_line(): rename and refactor
  checkdiff: pass diff_options to the callback
  Teach "diff --check" about new blank lines at end
  diff --check: detect leftover conflict markers
  Update sample pre-commit hook to use "diff --check"
  Document the double-dash "rev -- path" disambiguator
  t9700: skip when Test::More is not available
  Update draft release notes for 1.6.0
  Update draft release notes for 1.6.0

Kevin Ballard (1):
  git-send-email: Accept fifos as well as files

Lea Wiemann (5):
  t/test-lib.sh: add test_external and test_external_without_stderr
  Git.pm: add test suite
  gitweb: standarize HTTP status codes
  test-lib.sh: show git init output when in verbose mode
  GIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copy

Linus Torvalds (4):
  Split up default "core" config parsing into helper routine
  Split up default "user" config parsing into helper routine
  Split up default "i18n" and "branch" config parsing into helper routines
  Add config option to enable 'fsync()' of object files

Miklos Vajna (1):
  A simple script to parse the results from the testcases

Nanako Shiraishi (1):
  gitcli: Document meaning of --cached and --index

Nguyễn Thái Ngọc Duy (1):
  Move all dashed-form commands to libexecdir

Nicolas Pitre (2):
  repack.usedeltabaseoffset config option now defaults to "true"
  pack.indexversion config option now defaults to 2

Olivier Marin (2):
  Documentation: remove {show,whatchanged}.difftree config options
  show_stats(): fix stats width calculation

Patrick Higgins (1):
  Remove the use of '--' in merge program invocation

Stephan Beyer (2):
  api-builtin.txt: update and fix typo
  t3404: stricter tests for git-rebase--interactive

Sverre Rabbelier (2):
  Modify test-lib.sh to output stats to t/test-results/*
  Hook up the result aggregation in the test makefile.

Ted Percival (1):
  Don't use dash commands (git-foo) in tutorial-2

Thomas Rast (2):
  git-send-email: add support for TLS via Net::SMTP::SSL
  git-send-email: prevent undefined variable warnings if no encryption is
    set

jrnieder@uchicago.edu (1):
  Documentation: don't assume git-sh-setup and git-parse-remote are in PATH

What's in git.git (stable)

[Junio C Hamano]

With accumulated fixes, the latest maintenance release 1.5.6.2 is out.

On the 'master' front, port to MinGW has now been merged, and the next
major release 1.6.0 is already taking shape.

----------------------------------------------------------------
* The 'master' branch has these since the last announcement
  in addition to what is in maint.

Adam Brewster (1):
  Move read_revisions_from_stdin from builtin-rev-list.c to revision.c

Brian Gernhardt (1):
  Documentation: Point to gitcli(7) from git(1)

Brian Hetro (5):
  builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and
    'format.suffix'
  convert.c: Use 'git_config_string' to get 'smudge' and 'clean'
  diff.c: Use 'git_config_string' to get 'diff.external'
  http.c: Use 'git_config_string' to clean up SSL config.
  builtin-commit.c: Use 'git_config_string' to get 'commit.template'

Christian Couder (2):
  Fix "config_error_nonbool" used with value instead of key
  Fix "config_error_nonbool" used with value instead of key

Johannes Schindelin (2):
  Windows: always chmod(, 0666) before unlink().
  git fetch-pack: do not complain about "no common commits" in an empty
    repo

Johannes Sixt (35):
  Add compat/regex.[ch] and compat/fnmatch.[ch].
  Compile some programs only conditionally.
  Add target architecture MinGW.
  Windows: Use the Windows style PATH separator ';'.
  setup.c: Prepare for Windows directory separators.
  Windows: Treat Windows style path names.
  Windows: Handle absolute paths in safe_create_leading_directories().
  Windows: Strip ".exe" from the program name.
  Windows: Implement a wrapper of the open() function.
  Windows: A minimal implemention of getpwuid().
  Windows: Work around misbehaved rename().
  Make my_mktime() public and rename it to tm_to_time_t()
  Windows: Implement gettimeofday().
  Windows: Fix PRIuMAX definition.
  Windows: Implement setitimer() and sigaction().
  Windows: Wrap execve so that shell scripts can be invoked.
  Windows: A pipe() replacement whose ends are not inherited to children.
  Windows: Implement start_command().
  Windows: A rudimentary poll() emulation.
  Windows: Disambiguate DOS style paths from SSH URLs.
  Windows: Implement asynchronous functions as threads.
  Windows: Work around incompatible sort and find.
  Windows: Implement wrappers for gethostbyname(), socket(), and connect().
  Windows: Implement a custom spawnve().
  Windows: Add a custom implementation for utime().
  Windows: Use a customized struct stat that also has the st_blocks member.
  Turn builtin_exec_path into a function.
  Windows: Compute the fallback for exec_path from the program invocation.
  Windows: Use a relative default template_dir and ETC_GITCONFIG
  When installing, be prepared that template_dir may be relative.
  Windows: Make the pager work.
  Windows: Work around an oddity when a pipe with no reader is written to.
  Windows: Make 'git help -a' work.
  Windows: TMP and TEMP environment variables specify a temporary
    directory.
  t4127-apply-same-fn: Avoid sed -i

Jonathan Nieder (15):
  git-format-patch(1): fix stray \ in output
  Documentation: fix gitlinks
  manpages: fix bogus whitespace
  git(1): add comma
  git-commit(1): depersonalize description
  Documentation: rewrap to prepare for "git-" vs "git " change
  Documentation: more "git-" versus "git " changes
  gitdiffcore(7): fix awkward wording
  manpages: italicize command names in synopses
  manpages: italicize command names
  manpages: italicize git command names (which were in teletype font)
  manpages: italicize gitk's name (where it was in teletype font)
  manpages: italicize nongit command names (if they are in teletype font)
  manpages: italicize git subcommand names (which were in teletype font)
  manpages: use teletype font for sample command lines

Junio C Hamano (3):
  fast-export --export-marks: fix off by one error
  attribute documentation: keep EXAMPLE at end
  clone -q: honor "quiet" option over native transports.

Marius Storm-Olsen (1):
  Windows: Add a new lstat and fstat implementation based on Win32 API.

Matthew Ogilvie (1):
  Documentation cvs: Clarify when a bare repository is needed

Miklos Vajna (6):
  Retire 'stupid' merge strategy
  INSTALL: Update section about git-frotz form.
  hg-to-git: avoid raising a string exception
  hg-to-git: abort if the project directory is not a hg repo
  hg-to-git: rewrite "git-frotz" to "git frotz"
  hg-to-git: use git init instead of git init-db

Nikolaus Schulz (1):
  Documentation: be precise about which date --pretty uses

Ramsay Allan Jones (1):
  Fix some warnings (on cygwin) to allow -Werror

Steffen Prohaska (2):
  Windows: Fix ntohl() related warnings about printf formatting
  compat/pread.c: Add a forward declaration to fix a warning

Thomas Rast (2):
  git-send-email: Do not attempt to STARTTLS more than once
  Fix apply --recount handling of no-EOL line

What's in git.git (stable)

[Junio C Hamano]

* The 'maint' branch has these fixes since 1.5.6.2.

Alex Riesen (1):
  git-clone: remove leftover debugging fprintf().

Brian Hetro (5):
  builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and
    'format.suffix'
  convert.c: Use 'git_config_string' to get 'smudge' and 'clean'
  diff.c: Use 'git_config_string' to get 'diff.external'
  http.c: Use 'git_config_string' to clean up SSL config.
  builtin-commit.c: Use 'git_config_string' to get 'commit.template'

Christian Couder (1):
  Fix "config_error_nonbool" used with value instead of key

Gerrit Pape (1):
  git-svn.perl: workaround assertions in svn library 1.5.0

Junio C Hamano (3):
  attribute documentation: keep EXAMPLE at end
  clone -q: honor "quiet" option over native transports.
  mailinfo: feed the correct line length to decode_transfer_encoding()

Matthew Ogilvie (1):
  Documentation cvs: Clarify when a bare repository is needed

Mikael Magnusson (1):
  Fix grammar in git-rev-parse(1).

Nikolaus Schulz (1):
  Documentation: be precise about which date --pretty uses


* The 'master' branch has these since the last announcement
  in addition to the above.

Abhijit Menon-Sen (2):
  git-gui: Move on to the next filename after staging/unstaging a change
  git-gui: Don't select the wrong file if the last listed file is staged.

Daniel Barkalow (1):
  Only use GIT_CONFIG in "git config", not other programs

David Reiss (4):
  Implement normalize_absolute_path
  Fold test-absolute-path into test-path-utils
  Add support for GIT_CEILING_DIRECTORIES
  Eliminate an unnecessary chdir("..")

Dmitry Potapov (1):
  completion.bash: add 'skip' and 'run' to git-bisect

Jakub Narebski (1):
  gitweb: Describe projects_index format in more detail

Johannes Schindelin (3):
  Add another fast-import example, this time for .zip files
  git daemon: avoid calling syslog() from a signal handler
  run_command(): respect GIT_TRACE

Johannes Sixt (1):
  git-gui: Implement "Stage/Unstage Line"

Junio C Hamano (6):
  rerere: rerere_created_at() and has_resolution() abstraction
  git-rerere: detect unparsable conflicts
  rerere: remove dubious "tail_optimization"
  t4200: fix rerere test
  rerere.autoupdate
  Update draft release notes for 1.6.0

Richard Quirk (1):
  git-gui: Fix accidental staged state toggle when clicking top pixel row

What's in git.git (stable)

[Junio C Hamano]

* The 'maint' branch is at 1.5.6.3

* The 'master' branch has these since the last announcement
  in addition to what's in 1.5.6.3

Abhijit Menon-Sen (2):
  Implement "git stash branch <newbranch> <stash>"
  Add a test for "git stash branch"

Adam Brewster (1):
  Teach git-bundle to read revision arguments from stdin like git-rev-list.

Brandon Casey (1):
  t7701-repack-unpack-unreachable.sh: check timestamp of unpacked objects

Eric Hanchrow (2):
  user-manual: typo and grammar fixes
  Documentation: fix broken "linkgit" links

Eric Raible (2):
  Documentation: tweak use case in "git stash save --keep-index"
  completion: add branch options --contains --merged --no-merged

Jeff King (2):
  Allow per-command pager config
  avoid null SHA1 in oldest reflog

Johannes Schindelin (2):
  Teach "git apply" to prepend a prefix with "--root=<root>"
  Allow cherry-picking root commits

Johannes Sixt (1):
  Provide fallback definitions of PRIu32 and PRIx32

Junio C Hamano (17):
  revision traversal: --children option
  rev-list --children
  builtin-blame.c: move prepare_final() into a separate function.
  builtin-blame.c: allow more than 16 parents
  git-blame --reverse
  Per-ref reflog expiry configuration
  Make default expiration period of reflog used for stash infinite
  apply --root: thinkofix.
  Refactor "tracking statistics" code used by "git checkout"
  git-status: show the remote tracking statistics
  git-branch -v: show the remote tracking statistics
  stat_tracking_info(): clear object flags used during counting
  branch -r -v: do not spit out garbage
  git-apply --directory: make --root more similar to GNU diff
  Tone down warning about GNU Interactive Tools
  Documentation: update sections on naming revisions and revision ranges
  apply: fix copy/rename breakage

Mark Levedahl (1):
  install-doc-quick - use git --exec-path to find git-sh-setup

Mike Hommey (4):
  Catch failures from t5540-http-push
  Fix http-push test
  Skip t5540-http-push test when USE_CURL_MULTI is undefined
  Avoid apache complaining about lack of server's FQDN

Petr Baudis (1):
  Git.pm: Add remote_refs() git-ls-remote frontend

Pierre Habouzit (12):
  parse-opt: have parse_options_{start,end}.
  parse-opt: Export a non NORETURN usage dumper.
  parse-opt: create parse_options_step.
  parse-opt: do not print errors on unknown options, return -2 intead.
  parse-opt: fake short strings for callers to believe in.
  parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
  revisions: split handle_revision_opt() from setup_revisions()
  git-blame: migrate to incremental parse-option [1/2]
  git-blame: migrate to incremental parse-option [2/2]
  git-blame: fix lapsus
  git-shortlog: migrate to parse-options partially.
  revisions: refactor handle_revision_opt into parse_revision_opt.

Ramsay Allan Jones (3):
  t9113-*.sh: provide user feedback when test skipped
  t9100-git-svn-basic.sh: Fix determination of utf-8 locale
  git-request-pull: replace call to deprecated peek-remote

Robert Shearman (1):
  git-send-email: Fix authenticating on some servers when using TLS.

SZEDER Gábor (1):
  stash: introduce 'stash save --keep-index' option

Shawn O. Pearce (3):
  Correct pack memory leak causing git gc to try to exceed ulimit
  bash completion: Improve responsiveness of git-log completion
  bash completion: Don't offer "a.." as a completion for "a."

Stephan Beyer (3):
  git-am/git-mailsplit: correct synopsis for reading from stdin
  t3404: test two "preserve merges with -p" cases
  Make rebase--interactive use OPTIONS_SPEC

Thomas Rast (3):
  git-add--interactive: replace hunk recounting with apply --recount
  git-add--interactive: remove hunk coalescing
  git-add--interactive: manual hunk editing mode

What's in git.git (stable)

[Junio C Hamano]

"Merge-in-C" is in, so is "rename .dotest", and remaining Windows bits.
Now it is almost there for 1.6.0-rc0.

* The 'master' branch has these since the last announcement.

Alexander N. Gavrilov (1):
  Fix quadratic performance in rewrite_one.

Brian Gernhardt (1):
  Documentation: mention ORIG_HEAD in am, merge, and rebase

Ciaran McCreesh (1):
  Make git-add -i accept ranges like 7-

Dmitry Kakurin (1):
  Fixed text file auto-detection: treat EOF character 032 at the end of
    file as printable

Frederik Schwarzer (1):
  git-svn: typofix

Ian Katz (1):
  tutorial: use prompt with user names in example, to clarify who is doing
    what

Johannes Schindelin (6):
  Convert CR/LF to LF in tag signatures
  Add pretty format %aN which gives the author name, respecting .mailmap
  Move MERGE_RR from .git/rr-cache/ into .git/
  git-gui: MERGE_RR lives in .git/ directly with newer Git versions
  shortlog: support --pretty=format: option
  Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"

João Abecasis (1):
  git-svn: find-rev and rebase for SVN::Mirror repositories

Junio C Hamano (10):
  Introduce get_merge_bases_many()
  Introduce reduce_heads()
  Teach "am" and "rebase" to mark the original position with ORIG_HEAD
  branch --contains: default to HEAD
  branch --merged/--no-merged: allow specifying arbitrary commit
  Teach merge.log to "git-merge" again
  Update draft release notes for 1.6.0
  reduce_heads(): protect from duplicate input
  tutorial: clarify "pull" is "fetch + merge"
  Update draft release notes to 1.6.0

Lukas Sandström (1):
  git-mailinfo: Fix getting the subject from the in-body [PATCH] line

Mark Levedahl (2):
  git-submodule - make "submodule add" more strict, and document it
  git-submodule - register submodule URL if adding in place

Mike Pape (1):
  We need to check for msys as well as Windows in add--interactive.

Miklos Vajna (15):
  Move split_cmdline() to alias.c
  Move commit_list_count() to commit.c
  Move parse-options's skip_prefix() to git-compat-util.h
  Add new test to ensure git-merge handles pull.twohead and pull.octopus
  Move read_cache_unmerged() to read-cache.c
  git-fmt-merge-msg: make it usable from other builtins
  Introduce get_octopus_merge_bases() in commit.c
  Add new test to ensure git-merge handles more than 25 refs.
  Add new test case to ensure git-merge reduces octopus parents when
    possible
  Add new test case to ensure git-merge prepends the custom merge message
  git-commit-tree: make it usable from other builtins
  Fix t7601-merge-pull-config.sh on AIX
  Build in merge
  t6021: add a new test for git-merge-resolve
  Add a new test for git-merge-resolve

Nicolas Pitre (1):
  restore legacy behavior for read_sha1_file()

Olivier Marin (1):
  builtin-rerere: more carefully find conflict markers

Pavel Roskin (1):
  t9600: allow testing with cvsps 2.2, including beta versions

Pierre Habouzit (1):
  parse-options: add PARSE_OPT_LASTARG_DEFAULT flag

Shawn O. Pearce (3):
  bash completion: Append space after file names have been completed
  bash completion: Resolve git show ref:path<tab> losing ref: portion
  bash completion: Remove dashed command completion support

Soeren Finster (1):
  git-gui: Exit shortcut in MacOSX repaired

Steffen Prohaska (3):
  Move code interpreting path relative to exec-dir to new function
    system_path()
  help.c: Add support for htmldir relative to git_exec_path()
  help (Windows): Display HTML in default browser using Windows' shell API

Stephan Beyer (1):
  rerere: Separate libgit and builtin functions

Sverre Hvammen Johansen (1):
  reduce_heads(): thinkofix

Teemu Likonen (1):
  bash: Add long option completion for 'git send-email'

What's in git.git (stable)

[Junio C Hamano]

* The 'maint' branch is at 1.5.6.4.

* The 'master' branch has these since the last announcement
  in addition to what is already in 1.5.6.4.

Alexander Gavrilov (3):
  Avoid rescanning unchanged entries in search for copies.
  Do not try to detect move/copy for entries below threshold.
  Support gitlinks in fast-import.

Eric Raible (1):
  Teach lookup_prog not to select directories

Eric Wong (1):
  t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory"

Fabian Emmes (2):
  Testsuite: Unset CVS_SERVER
  testsuite for cvs co -c

Johannes Sixt (1):
  builtin-clone: rewrite guess_dir_name()

Junio C Hamano (9):
  git-rebase: report checkout failure
  t/aggregate-results: whitespace fix
  Update draft release notes for 1.6.0
  read-cache.c: typofix
  mailinfo: off-by-one fix for [PATCH (foobar)] removal from Subject: line
  builtin-remote.c: fix earlier "skip_prefix()" conversion
  t9001 (send-email): Do not use hardcoded /bin/sh in test
  .mailmap update
  Getting closer to 1.6.0-rc0

Lars Noschinski (2):
  cvsserver: Add support for packed refs
  cvsserver: Add cvs co -c support

Lukas Sandström (3):
  Make some strbuf_*() struct strbuf arguments const.
  Add some useful functions for strbuf manipulation.
  git-mailinfo: use strbuf's instead of fixed buffers

Miklos Vajna (4):
  t0001-init.sh: change confusing directory name
  t1007-hash-object.sh: use quotes for the test description
  git-bisect: use dash-less form on git bisect log
  make remove-dashes: apply to scripts and programs as well, not just to
    builtins

Nanako Shiraishi (3):
  cache-tree.c: make cache_tree_find() static
  builtin-describe.c: make a global variable "pattern" static
  parse-options.c: make check_typos() static

Peter Harris (1):
  Add ANSI control code emulation for the Windows console

Petr Baudis (5):
  Documentation/git-submodule.txt: Add Description section
  Documentation/RelNotes-1.6.0.txt: Expand on the incompatible packfiles
  Documentation/git-submodule.txt: Further clarify the description
  Documentation: How to ignore local changes in tracked files
  Documentation/git-merge.txt: Partial rewrite of How Merge Works

René Scharfe (8):
  archive: remove args member from struct archiver
  add context pointer to read_tree_recursive()
  archive: add baselen member to struct archiver_args
  archive: centralize archive entry writing
  archive: unify file attribute handling
  archive: remove extra arguments parsing code
  archive: make zip compression level independent from core git
  archive: remove unused headers

Stephan Beyer (4):
  t/test-lib.sh: exit with small negagive int is ok with test_must_fail
  t/: Use "test_must_fail git" instead of "! git"
  Make usage strings dash-less
  Link git-shell only to a subset of libgit.a

SungHyun Nam (1):
  t/Makefile: use specified shell when running aggregation script

Re: What's in git.git (stable)

[Lars Noschinski]

* Junio C Hamano <gitster@pobox.com> [08-07-20 03:59]:
>Lars Noschinski (2):
>  cvsserver: Add support for packed refs
>  cvsserver: Add cvs co -c support

Any specific reason why you did not merge the test for packed refs
support? Was it considered superfluous?

Re: What's in git.git (stable)

[Junio C Hamano]

Lars Noschinski <lars-2008-1@usenet.noschinski.de> writes:

> * Junio C Hamano <gitster@pobox.com> [08-07-20 03:59]:
>>Lars Noschinski (2):
>>  cvsserver: Add support for packed refs
>>  cvsserver: Add cvs co -c support
>
> Any specific reason why you did not merge the test for packed refs
> support? Was it considered superfluous?

No, it was not even considered.  This phenomenon is called "lost in the
noise" ;-)

Thanks for reminding.  Applied.