git, branch v1.7.12-rc1

Git 1.7.12-rc1

2012-07-30T20:20:00Z

Signed-off-by: Junio C Hamano

Sync with 1.7.11.4

2012-07-30T20:18:18Z

Signed-off-by: Junio C Hamano

Git 1.7.11.4

2012-07-30T20:16:51Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/maint-commit-document-editmsg' into maint

2012-07-30T20:05:36Z

"$GIT_DIR/COMMIT_EDITMSG" file that is used to hold the commit log message user edits was not documented. * jk/maint-commit-document-editmsg: commit: document the temporary commit message file

Merge branch 'jk/maint-advise-vaddf' into maint

2012-07-30T20:05:25Z

The advise() function did not use varargs correctly to format its message. * jk/maint-advise-vaddf: advice: pass varargs to strbuf_vaddf, not strbuf_addf

Merge branch 'kk/maint-commit-tree' into maint

2012-07-30T20:05:13Z

"git commit-tree" learned a more natural "-p " order of arguments long time ago, but recently forgot it by mistake. * kk/maint-commit-tree: Revert "git-commit-tree(1): update synopsis" commit-tree: resurrect command line parsing updates

Merge branch 'jv/maint-no-ext-diff' into maint

2012-07-30T20:04:59Z

"git diff --no-ext-diff" did not output anything for a typechange filepair when GIT_EXTERNAL_DIFF is in effect. * jv/maint-no-ext-diff: diff: test precedence of external diff drivers diff: correctly disable external_diff with --no-ext-diff

Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maint

2012-07-30T20:04:39Z

When "git am" failed, old timers knew to check .git/rebase-apply/patch to see what went wrong, but we never told the users about it. * pg/maint-1.7.9-am-where-is-patch: am: indicate where a failed patch is to be found

Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maint

2012-07-30T20:04:18Z

When "git submodule add" clones a submodule repository, it can get confused where to store the resulting submodule repository in the superproject's .git/ directory when there is a symbolic link in the path to the current directory. * jl/maint-1.7.10-recurse-submodules-with-symlink: submodules: don't stumble over symbolic links when cloning recursively

Merge branch 'jc/maint-filter-branch-epoch-date' into maint

2012-07-30T20:04:18Z

In 1.7.9 era, we taught "git rebase" about the raw timestamp format but we did not teach the same trick to "filter-branch", which rolled a similar logic on its own. * jc/maint-filter-branch-epoch-date: t7003: add test to filter a branch with a commit at epoch date.c: Fix off by one error in object-header date parsing filter-branch: do not forget the '@' prefix to force git-timestamp