delta/git.git/Documentation, branch pm/build-persistent-https-with-recent-go

Git 2.6.6

2016-03-17T18:26:41+00:00

Signed-off-by: Junio C Hamano

Merge branch 'maint-2.5' into maint-2.6

2016-03-17T18:26:18+00:00

* maint-2.5:
  Git 2.5.5
  Git 2.4.11
  list-objects: pass full pathname to callbacks
  list-objects: drop name_path entirely
  list-objects: convert name_path to a strbuf
  show_object_with_name: simplify by using path_name()
  http-push: stop using name_path
  tree-diff: catch integer overflow in combine_diff_path allocation
  add helpers for detecting size_t overflow

Git 2.5.5

2016-03-17T18:24:59+00:00

Signed-off-by: Junio C Hamano

Merge branch 'maint-2.4' into maint-2.5

2016-03-17T18:24:14+00:00

* maint-2.4:
  Git 2.4.11
  list-objects: pass full pathname to callbacks
  list-objects: drop name_path entirely
  list-objects: convert name_path to a strbuf
  show_object_with_name: simplify by using path_name()
  http-push: stop using name_path
  tree-diff: catch integer overflow in combine_diff_path allocation
  add helpers for detecting size_t overflow

Git 2.4.11

2016-03-17T18:23:05+00:00

Signed-off-by: Junio C Hamano

Git 2.6.5

2016-01-04T22:06:00+00:00

Signed-off-by: Junio C Hamano

Update draft release notes to 2.6.5

2015-12-15T17:44:54+00:00

Signed-off-by: Junio C Hamano

Merge branch 'ls/p4-keep-empty-commits' into maint

2015-12-15T17:34:19+00:00

"git p4" used to import Perforce CLs that touch only paths outside
the client spec as empty commits.  It has been corrected to ignore
them instead, with a new configuration git-p4.keepEmptyCommits as a
backward compatibility knob.

* ls/p4-keep-empty-commits:
  git-p4: add option to keep empty commits

Prepare for 2.6.5

2015-12-11T19:17:47+00:00

This back-merges hopefully the last batch of trivially correct fixes
to the 2.6.x maintenance track from the master branch.

Signed-off-by: Junio C Hamano

Merge branch 'sb/doc-submodule-sync-recursive' into maint

2015-12-11T19:14:17+00:00

* sb/doc-submodule-sync-recursive:
  document submodule sync --recursive