doc: fix trivial 'git stage' link

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Synchronize remote-helpers streamline

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
mergetool: run prompt only if guessed tool

It's annoying to see the prompt:

  Hit return to start merge resolution tool (foo):

Every time the user does 'git mergetool' even if the user already
configured 'foo' as the wanted tool.

Display this prompt only when the user hasn't explicitly configured a
tool.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
merge: enable defaulttoupstream by default

There's no point in this:

% git merge
fatal: No commit specified and merge.defaultToUpstream not set.

We know the most likely scenario is that the user wants to merge the
upstream, and if not, he can set merge.defaultToUpstream to false.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
config: remove custom config helper

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
config: do not always track branches in progress

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
add: sync with integration

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
rerere: fix for merge.conflictstyle

If we use a different conflict style `git rerere forget` is not able to
find the matching conflict SHA-1 because the diff generated is actually
different from what `git merge` generated.

The fix is to call git_xmerge_config() so that git_xmerge_style is set
properly and the diffs match.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>