delta/git.git, branch v2.2.0-rc2

Git 2.2.0-rc2

2014-11-14T21:31:15+00:00

Signed-off-by: Junio C Hamano

Update draft release notes to 2.2

2014-11-12T20:13:39+00:00

Signed-off-by: Junio C Hamano

Sync with 'maint'

2014-11-12T20:13:25+00:00

Merge branch 'nd/gitignore-trailing-whitespace' into maint

2014-11-12T20:13:12+00:00

* nd/gitignore-trailing-whitespace:
  gitignore.txt: fix spelling of "backslash"

Merge branch 'jk/fetch-reflog-df-conflict'

2014-11-12T19:59:58+00:00

Fix-up a test for portability.

* jk/fetch-reflog-df-conflict:
  t1410: fix breakage on case-insensitive filesystems

Sync with maint

2014-11-11T20:45:48+00:00

* maint:

Merge branch 'rs/clean-menu-item-defn' into maint

2014-11-11T18:20:13+00:00

* rs/clean-menu-item-defn:
  clean: use f(void) instead of f() to declare a pointer to a function without arguments

run-command: use void to declare that functions take no parameters

2014-11-10T22:43:19+00:00

Explicitly declare that git_atexit_dispatch() and git_atexit_clear()
take no parameters instead of leaving their parameter list empty and
thus unspecified.

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

Merge branch 'master' of git://github.com/git-l10n/git-po

2014-11-10T19:59:30+00:00

* 'master' of git://github.com/git-l10n/git-po:
  l10n: Updated Bulgarian translation of git (2296t,0f,0u)
  l10n: zh_CN: translations for git v2.2.0-rc0
  l10n: sv.po: Update Swedish translation (2296t0f0u)
  l10n: fr.po (2296t) update for version 2.2.0
  l10n: vi.po: Update new message strings
  l10n: git.pot: v2.2.0 round 1 (62 new, 23 removed)

Sync with maint

2014-11-10T19:26:18+00:00

* maint:
  Documentation/config.txt: fix minor typo
  config.txt: fix typo