Merge branch 'ah/stripspace-optstring' into maint

Junio C Hamano committed over 10 years ago

merge-strategies.txt: fix typo

Felipe Gonçalves Assis committed over 10 years ago

diff: clarify textconv interface

Jeff King committed over 10 years ago

Merge branch 'ks/svn-pathnameencoding-4' of git://git.bogomips.org/git-svn

Junio C Hamano committed over 10 years ago

Merge branch 'pw/completion-stash'

Junio C Hamano committed over 10 years ago

completion: fix mis-indentation in _git_stash()

SZEDER Gábor committed over 10 years ago

config: rename git_config_set_or_die to git_config_set

Patrick Steinhardt committed over 10 years ago

config: rename git_config_set to git_config_set_gently

Patrick Steinhardt committed over 10 years ago

compat: die when unable to set core.precomposeunicode

Patrick Steinhardt committed over 10 years ago

sequencer: die on config error when saving replay opts

Patrick Steinhardt committed over 10 years ago

init-db: die on config errors when initializing empty repo

Patrick Steinhardt committed over 10 years ago

clone: die on config error in cmd_clone

Patrick Steinhardt committed over 10 years ago

remote: die on config error when manipulating remotes

Patrick Steinhardt committed over 10 years ago

remote: die on config error when setting/adding branches

Patrick Steinhardt committed over 10 years ago

remote: die on config error when setting URL

Patrick Steinhardt committed over 10 years ago

submodule--helper: die on config error when cloning module

Patrick Steinhardt committed over 10 years ago

submodule: die on config error when linking modules

Patrick Steinhardt committed over 10 years ago

branch: die on config error when editing branch description

Patrick Steinhardt committed over 10 years ago

branch: die on config error when unsetting upstream

Patrick Steinhardt committed over 10 years ago

branch: report errors in tracking branch setup

Patrick Steinhardt committed over 10 years ago