user/sven/git.git/Documentation, branch v2.7.0-rc2

Git 2.7-rc2

2015-12-22T22:46:01Z

Signed-off-by: Junio C Hamano

Update release notes to 2.7

2015-12-21T19:08:20Z

Signed-off-by: Junio C Hamano

Merge branch 'bc/format-patch-null-from-line'

2015-12-21T18:59:08Z

"format-patch" has learned a new option to zero-out the commit object name on the mbox "From " line. * bc/format-patch-null-from-line: format-patch: check that header line has expected format format-patch: add an option to suppress commit hash sha1_file.c: introduce a null_oid constant

Merge branch 'mc/push-recurse-submodules-config'

2015-12-21T18:59:05Z

Add new config to avoid typing "--recurse-submodules" on each push. * mc/push-recurse-submodules-config: push: follow the "last one wins" convention for --recurse-submodules push: test that --recurse-submodules on command line overrides config push: add recurseSubmodules config option

format-patch: add an option to suppress commit hash

2015-12-15T18:03:40Z

Oftentimes, patches created by git format-patch will be stored in version control or compared with diff. In these cases, two otherwise identical patches can have different commit hashes, leading to diff noise. Teach git format-patch a --zero-commit option that instead produces an all-zero hash to avoid this diff noise. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

Git 2.7-rc1

2015-12-15T17:47:11Z

Signed-off-by: Junio C Hamano

Sync with maint

2015-12-15T17:45:16Z

Update draft release notes to 2.6.5

2015-12-15T17:44:54Z

Signed-off-by: Junio C Hamano

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

2015-12-15T17:34:19Z

"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

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

2015-12-15T16:02:19Z