git, branch v2.8.0-rc4

Git 2.8-rc4

2016-03-21T20:41:37Z

Signed-off-by: Junio C Hamano

Sync with maint

2016-03-21T20:32:42Z

* maint: Documentation: fix broken linkgit to git-config git-compat-util: st_add4: work around gcc 4.2.x compiler crash

Merge branch 'mm/doc-hooks-linkgit-fix' into maint

2016-03-21T20:32:18Z

* mm/doc-hooks-linkgit-fix: Documentation: fix broken linkgit to git-config

Documentation: fix broken linkgit to git-config

2016-03-21T20:31:57Z

Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

Merge branch 'tb/avoid-gcc-on-darwin-10-6'

2016-03-21T16:20:13Z

* tb/avoid-gcc-on-darwin-10-6: Revert "config.mak.uname: use clang for Mac OS X 10.6"

Revert "config.mak.uname: use clang for Mac OS X 10.6"

2016-03-21T16:20:02Z

This reverts commit 7b6daf8d2fee1a9866b1d4eddbfaa5dbc42c5dbb. Now that st_add4() has been patched to work around the gcc 4.2.x compiler crash, revert the sledge-hammer approach of forcing Mac OS X 10.6 to unconditionally use 'clang' rather than the default compiler (gcc). Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano

Merge branch 'es/st-add4-gcc-4.2-workaround' into maint

2016-03-21T16:19:27Z

* es/st-add4-gcc-4.2-workaround: git-compat-util: st_add4: work around gcc 4.2.x compiler crash

git-compat-util: st_add4: work around gcc 4.2.x compiler crash

2016-03-21T16:18:07Z

Although changes by 5b442c4 (tree-diff: catch integer overflow in combine_diff_path allocation, 2016-02-19) are perfectly valid, they unfortunately trigger an internal compiler error in gcc 4.2.x: combine-diff.c: In function 'diff_tree_combined': combine-diff.c:1391: internal compiler error: Segmentation fault: 11 Experimentation reveals that changing st_add4()'s argument evaluation order is sufficient to sidestep this problem. Although st_add3() does not trigger the compiler bug, for style consistency, change its argument evaluation order to match. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano

Merge tag 'l10n-2.8.0-rnd3' of git://github.com/git-l10n/git-po

2016-03-21T01:06:05Z

l10n-2.8.0-rnd3 * tag 'l10n-2.8.0-rnd3' of git://github.com/git-l10n/git-po: l10n: zh_CN: review for git v2.8.0 l10n round 2 l10n: de.po: add missing newlines l10n: de.po: translate 22 new messages l10n: ko.po: Update Korean translation l10n: fr.po v2.8.0 round 3 l10n: sv.po: Update Swedish translation (2530t0f0u) l10n: ru.po: update Russian translation

Merge branch 'master' of git://ozlabs.org/~paulus/gitk

2016-03-21T01:05:10Z

* 'master' of git://ozlabs.org/~paulus/gitk: gitk: Follow themed bgcolor in help dialogs gitk: fr.po: Sync translations with git gitk: Update French translation (311t) gitk: Update German translation gitk: Update Bulgarian translation (311t)