git, branch v2.7.2

Git 2.7.2

2016-02-22T21:12:56Z

Signed-off-by: Junio C Hamano

Merge branch 'nd/ita-cleanup' into maint

2016-02-22T21:10:21Z

Paths that have been told the index about with "add -N" are not quite yet in the index, but a few commands behaved as if they already are in a harmful way. * nd/ita-cleanup: grep: make it clear i-t-a entries are ignored add and use a convenience macro ce_intent_to_add() blame: remove obsolete comment

Merge branch 'pw/completion-stash' into maint

2016-02-22T21:10:20Z

* pw/completion-stash: completion: fix mis-indentation in _git_stash()

Merge branch 'mm/clean-doc-fix' into maint

2016-02-22T21:10:20Z

The documentation for "git clean" has been corrected; it mentioned that .git/modules/* are removed by giving two "-f", which has never been the case. * mm/clean-doc-fix: Documentation/git-clean.txt: don't mention deletion of .git/modules/*

Merge branch 'dw/mergetool-vim-window-shuffle' into maint

2016-02-22T21:10:20Z

The vimdiff backend for "git mergetool" has been tweaked to arrange and number buffers in the order that would match the expectation of majority of people who read left to right, then top down and assign buffers 1 2 3 4 "mentally" to local base remote merge windows based on that order. * dw/mergetool-vim-window-shuffle: mergetool: reorder vim/gvim buffers in three-way diffs

Merge branch 'ah/stripspace-optstring' into maint

2016-02-22T21:10:19Z

* ah/stripspace-optstring: stripspace: call U+0020 a "space" instead of a "blank"

completion: fix mis-indentation in _git_stash()

2016-02-22T18:26:04Z

Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano

Start preparing for 2.7.2

2016-02-17T18:05:44Z

Signed-off-by: Junio C Hamano

Merge branch 'js/test-lib-windows-emulated-yes' into maint

2016-02-17T18:03:41Z

The emulated "yes" command used in our test scripts has been tweaked not to spend too much time generating unnecessary output that is not used, to help those who test on Windows where it would not stop until it fills the pipe buffer due to lack of SIGPIPE. * js/test-lib-windows-emulated-yes: test-lib: limit the output of the yes utility

Merge branch 'aw/push-force-with-lease-reporting' into maint

2016-02-17T18:03:40Z

"git push --force-with-lease" has been taught to report if the push needed to force (or fast-forwarded). * aw/push-force-with-lease-reporting: push: fix ref status reporting for --force-with-lease