The next patch implements a workaround in case unlink fails on Windows.
Signed-off-by: NHeiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* ja/maint-pull-rebase-doc:
  git-pull.txt: Mention branch.autosetuprebase

* gb/web--browse:
  web--browse: better support for chromium
  web--browse: support opera, seamonkey and elinks
  web--browse: split valid_tool list
  web--browse: coding style

* jn/parse-options-extra:
  update-index: migrate to parse-options API
  setup: save prefix (original cwd relative to toplevel) in startup_info
  parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION
  parse-options: allow git commands to invent new option types
  parse-options: never suppress arghelp if LITERAL_ARGHELP is set
  parse-options: do not infer PARSE_OPT_NOARG from option type
  parse-options: sanity check PARSE_OPT_NOARG flag
  parse-options: move NODASH sanity checks to parse_options_check
  parse-options: clearer reporting of API misuse
  parse-options: Don't call parse_options_check() so much

* js/configurable-tab:
  Make the tab width used for whitespace checks configurable
  apply --whitespace=fix: fix tab-in-indent

* nd/maint-hide-checkout-index-from-error:
  entry.c: remove "checkout-index" from error messages

* jn/gitweb-per-request-config:
  gitweb: document $per_request_config better
  gitweb: selectable configurations that change with each request

* ef/help-cmd-prefix:
  help: always suggest common-cmds if prefix of cmd

* tc/http-urls-ends-with-slash:
  http-fetch: rework url handling
  http-push: add trailing slash at arg-parse time, instead of later on
  http-push: check path length before using it
  http-push: Normalise directory names when pushing to some WebDAV servers
  http-backend: use end_url_with_slash()
  url: add str wrapper for end_url_with_slash()
  shift end_url_with_slash() from http.[ch] to url.[ch]
  t5550-http-fetch: add test for http-fetch
  t5550-http-fetch: add missing '&&'

* tc/format-patch-p:
  format-patch: page output with --stdout

* ef/win32-dirent:
  win32: use our own dirent.h
  msvc: opendir: handle paths ending with a slash
  win32: dirent: handle errors
  msvc: opendir: do not start the search
  msvc: opendir: allocate enough memory
  msvc: opendir: fix malloc-failure

Conflicts:
	Makefile

* mz/rebase-i-verify:
  rebase: support --verify

* mz/rebase-abort-reflog-fix:
  rebase --abort: do not update branch ref

* jk/maint-reflog-bottom:
  reflogs: clear flags properly in corner case

* jk/asciidoc-update:
  docs: default to more modern toolset

* mz/pull-rebase-rebased:
  Use reflog in 'pull --rebase . foo'

* mz/maint-rebase-stat-config:
  rebase: only show stat if configured to true

* jn/git-cmd-h-bypass-setup:
  update-index -h: show usage even with corrupt index
  merge -h: show usage even with corrupt index
  ls-files -h: show usage even with corrupt index
  gc -h: show usage even with broken configuration
  commit/status -h: show usage even with broken configuration
  checkout-index -h: show usage even in an invalid repository
  branch -h: show usage even in an invalid repository

Conflicts:
	builtin/merge.c

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* jk/maint-decorate-01-bool:
  log.decorate: accept 0/1 bool values

* mg/maint-tag-rfc1991:
  tag: recognize rfc1991 signatures
  tag: factor out sig detection for tag display
  tag: factor out sig detection for body edits
  verify-tag: factor out signature detection
  t/t7004-tag: test handling of rfc1991 signatures

* ks/maint-getenv-fix:
  setup: make sure git_dir path is in a permanent buffer, getenv(3) case

All files that include this header file use the same four line
incantation:

    #ifndef NO_PTHREADS
    #include <pthread.h>
    #include "thread-utils.h"
    #endif

Move the responsibility for that gymnastics to the header file from the
files that include it.  This approach makes it easier to later declare new
services that are related to threading in thread-utils.h and have them
available to all the threading code.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

transport-helper.o gained a dependency on thread-utils.h in
7851b1e6 (remote-fd/ext: finishing touches after code review,
2010-11-17).
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NAlejandro R. Sedeño <asedeno@mit.edu>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* git://git.bogomips.org/git-svn:
  t9143: do not fail when unhandled.log.gz is not created
  git-svn: allow the mergeinfo property to be set

Recently we have made 1.7.3.3, 1.7.2.4, 1.7.1.3 and 1.7.0.8.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Do not depend on internal implementation details of svn,
which right now uses perl to create a .gz file.
So this test case will even work in the future,
when svn changes its implementation.
Signed-off-by: NTorsten Bögershausen <tboegi@web.de>
Acked-by: NEric Wong <normalperson@yhbt.net>

As a first step towards preserving merges across dcommit, we need a
mechanism to update the svn:mergeinfo property.

[ew: fixed bashism and style issues in test case]
Signed-off-by: NSteven Walter <stevenrwalter@gmail.com>
Acked-by: NEric Wong <normalperson@yhbt.net>

* maint:
  contrib/hooks/post-receive-email: fix return values from prep_for_email

* jn/ignore-doc:
  Documentation: point to related commands from gitignore
  Documentation: split gitignore page into sections

* jn/cherry-pick-refresh-index:
  cherry-pick/revert: transparently refresh index

* jl/add-p-reverse-message:
  Correct help blurb in checkout -p and friends

* np/diff-in-corrupt-repository:
  diff: don't presume empty file when corresponding object is missing

* fc/apply-p2-get-header-name:
  test: git-apply -p2 rename/chmod only
  Fix git-apply with -p greater than 1

* np/pack-broken-boundary:
  make pack-objects a bit more resilient to repo corruption

* ak/apply-non-git-epoch:
  apply: handle patches with funny filename and colon in timezone
  apply: Recognize epoch timestamps with : in the timezone

* cm/diff-check-at-eol:
  diff --check: correct line numbers of new blank lines at EOF