Signed-off-by: NJunio C Hamano <junkio@cox.net>

* master:
  GIT 1.3.0-rc3

Signed-off-by: NJunio C Hamano <junkio@cox.net>

* kh/svn:
  git-svnimport: Don't assume that copied files haven't changed

* jc/thinpack:
  Thin pack generation: optimization.

* jc/date:
  date parsing: be friendlier to our European friends.

* nh/http:
  Fix compile with expat, but an old curl version
  http-fetch: add optional DAV-based pack list

* ew/rev-abbrev:
  rev-list --abbrev-commit

* jc/blame:
  blame -S <ancestry-file>
  Match ofs/cnt types in diff interface.
  blame: use built-in xdiff
  combine-diff: move the code to parse hunk-header into common library.
  combine-diff: refactor built-in xdiff interface.
  combine-diff: use built-in xdiff.

* master:
  gitk: Fix incorrect invocation of getmergediffline
  [PATCH] gitk: Fix searching for filenames in gitk
  count-delta: match get_delta_hdr_size() changes.
  check patch_delta bounds more carefully

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix incorrect invocation of getmergediffline
  [PATCH] gitk: Fix searching for filenames in gitk

* maint:
  count-delta: match get_delta_hdr_size() changes.
  check patch_delta bounds more carefully

Signed-off-by: NJunio C Hamano <junkio@cox.net>

Let's avoid going south with invalid delta data.
Signed-off-by: NNicolas Pitre <nico@cam.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

* jc/thinpack:
  Thin pack generation: optimization.

* ew/rev-abbrev:
  rev-list --abbrev-commit

* jc/blame:
  blame -S <ancestry-file>
  Match ofs/cnt types in diff interface.

* kh/svn:
  git-svnimport: Don't assume that copied files haven't changed
  Add Documentation/technical/pack-format.txt
  Added Packing Heursitics IRC writeup.
  Add documentation for git-imap-send.

Don't assume that a file that SVN claims was copied from somewhere
else is bit-for-bit identical with its parent, since SVN allows
changes to copied files before they are committed.

Without this fix, such copy-modify-commit operations causes the
imported file to lack the "modify" part -- that is, we get subtle data
corruption.
Signed-off-by: NKarl Hasselström <kha@treskal.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This should make --pretty=oneline a whole lot more readable for
people using 80-column terminals.  Originally from Eric Wong.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Jens Axboe noticed that recent "git push" has become very slow
since we made --thin transfer the default.

Thin pack generation to push a handful revisions that touch
relatively small number of paths out of huge tree was stupid; it
registered _everything_ from the excluded revisions.  As a
result, "Counting objects" phase was unnecessarily expensive.

This changes the logic to register the blobs and trees from
excluded revisions only for paths we are actually going to send
to the other end.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

... along with the previous one, pack-heuristics, by popular
demand.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NJon Loeliger <jdl@jdl.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This adds the -S <ancestry-file> option to blame, which is
needed by the CVS server emulation.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NMike McCormack <mike@codeweavers.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

* master:
  blame.c: fix completely broken ancestry traversal.

Recent revision.c updates completely broken the assignment of
blames by not rewriting commit->parents field unless explicitly
asked to by the caller.  The caller needs to set revs.parents.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NPaul Mackerras <paulus@samba.org>

findcont should not accept any arguments.
Signed-off-by: NPavel Roskin <proski@gnu.org>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

* jc/date:
  date parsing: be friendlier to our European friends.
  Tweaks to make asciidoc play nice.
  git-commit: document --amend
  Avoid a crash if realloc returns a different pointer.
  Avoid a divide by zero if there's no messages to send.
  [PATCH] Provide configurable UI font for gitk
  [PATCH] gitk: Use git wrapper to run git-ls-remote.
  [PATCH] gitk: add key bindings for selecting first and last commit
  gitk: Add a help menu item to display key bindings
  [PATCH] gitk: allow goto heads
  gitk: replace parent and children arrays with lists

This does three things, only applies to cases where the user
manually tries to override the author/commit time by environment
variables, with non-ISO, non-2822 format date-string:

 - Refuses to use the interpretation to put the date in the
   future; recent kernel history has a commit made with
   10/03/2006 which is recorded as October 3rd.

 - Adds '.' as the possible year-month-date separator.  We
   learned from our European friends on the #git channel that
   dd.mm.yyyy is the norm there.

 - When the separator is '.', we prefer dd.mm.yyyy over
   mm.dd.yyyy; otherwise mm/dd/yy[yy] takes precedence over
   dd/mm/yy[yy].
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Once the content has been generated, the formatting elves can reorder
it to be pretty...
Signed-off-by: NFrancis Daly <francis@daoine.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

* jc/blame:
  blame: use built-in xdiff

* nh/http:
  Fix compile with expat, but an old curl version

This removes the last use of external diff from core git suite.
Also addresses the use of index() -- elsewhere we tend to use
strchr().
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The "--amend" option is used to amend the tip of the current branch. This
documentation text was copied straight from the commit that implemented it.

Some minor format tweaks for asciidoc were taken from work by Francis Daly
in commit b0d08a50.. It looks good now also in the html page.

[jc: amended further to follow the recommendation by Francis in
commit 3070b603].
Signed-off-by: NMarco Roeland <marco.roeland@xs4all.nl>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

* jc/clone:
  git-clone: fix handling of upsteram whose HEAD does not point at master.

* pb/regex:
  On some platforms, certain headers need to be included before regex.h
  Support for pickaxe matching regular expressions

Signed-off-by: NJunio C Hamano <junkio@cox.net>