delta/git.git, branch rs/remote-simplify

remote: simplify match_name_with_pattern() using strbuf

2014-09-22T19:40:27+00:00

Make the code simpler and shorter by avoiding repetitive use of
string length variables and leaving memory allocation to strbuf
functions.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

Update draft release notes to 2.2

2014-09-19T21:25:09+00:00

Signed-off-by: Junio C Hamano

Sync with Git 2.1.1

2014-09-19T21:22:43+00:00

Git 2.1.1

2014-09-19T21:21:31+00:00

Signed-off-by: Junio C Hamano

Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maint

2014-09-19T21:05:13+00:00

* et/spell-poll-infinite-with-minus-one-only:
  upload-pack: keep poll(2)'s timeout to -1

Merge branch 'nd/fetch-pass-quiet-to-gc-child-process' into maint

2014-09-19T21:05:12+00:00

* nd/fetch-pass-quiet-to-gc-child-process:
  fetch: silence git-gc if --quiet is given
  fetch: convert argv_gc_auto to struct argv_array

Merge branch 'jk/prune-top-level-refs-after-packing' into maint

2014-09-19T21:05:12+00:00

* jk/prune-top-level-refs-after-packing:
  pack-refs: prune top-level refs like "refs/foo"

Merge branch 'jk/fast-import-fixes' into maint

2014-09-19T21:05:12+00:00

* jk/fast-import-fixes:
  fast-import: fix buffer overflow in dump_tags
  fast-import: clean up pack_data pointer in end_packfile

Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maint

2014-09-19T21:05:12+00:00

* jn/unpack-trees-checkout-m-carry-deletion:
  checkout -m: attempt merge when deletion of path was staged
  unpack-trees: use 'cuddled' style for if-else cascade
  unpack-trees: simplify 'all other failures' case

Merge branch 'sp/pack-protocol-doc-on-shallow' into maint

2014-09-19T21:05:11+00:00

* sp/pack-protocol-doc-on-shallow:
  Document LF appearing in shallow command during send-pack/receive-pack