git, branch v1.7.11-rc1

Git 1.7.11-rc1

2012-06-03T22:56:05Z

Signed-off-by: Junio C Hamano

Sync with 1.7.10.4

2012-06-03T22:54:33Z

* maint: Git 1.7.10.4

Git 1.7.10.4

2012-06-03T22:53:58Z

Signed-off-by: Junio C Hamano

Merge branch 'ef/maint-rebase-error-message' into maint

2012-06-03T22:52:18Z

When "git rebase" was given a bad commit to replay the history on, its error message did not correctly give the command line argument it had trouble parsing. By Erik Faye-Lund * ef/maint-rebase-error-message: rebase: report invalid commit correctly

Update draft release notes to 1.7.11

2012-06-01T20:29:48Z

Signed-off-by: Junio C Hamano

Merge branch 'ef/maint-rebase-error-message'

2012-06-01T20:28:25Z

By Erik Faye-Lund * ef/maint-rebase-error-message: rebase: report invalid commit correctly

Merge branch 'nh/empty-rebase'

2012-06-01T20:28:19Z

* nh/empty-rebase: cherry-pick: regression fix for empty commits

Merge branch 'vr/rebase-autosquash-does-not-imply-i'

2012-06-01T20:28:01Z

"git rebase -p" used to pay attention to rebase.autosquash which was wrong. "git rebase -p -i" should, but "git rebase -p" by itself should not. By Vincent van Ravesteijn * vr/rebase-autosquash-does-not-imply-i: Do not autosquash in case of an implied interactive rebase

Merge branch 'mm/levenstein-penalize-deletion-less'

2012-06-01T20:27:48Z

"git tags" used to suggest "git stage" which was nonsense; it should have favored "git tag". Tweak the cost of deletion to correct it. By Matthieu Moy * mm/levenstein-penalize-deletion-less: Reduce cost of deletion in levenstein distance (4 -> 3)

Merge branch 'jl/submodule-report-new-path-once'

2012-06-01T20:26:46Z

"git submodule init" used to report "registered for path ..." even for submodules that were registered earlier. By Jens Lehmann * jl/submodule-report-new-path-once: submodules: print "registered for path" message only once