Merge branch 'hw/commit-advise-while-rejecting'

Junio C Hamano committed over 6 years ago

Merge branch 'dl/credential-netrc'

Junio C Hamano committed over 6 years ago

submodule.c: use get_git_dir() instead of get_git_common_dir()

Philippe Blain committed over 6 years ago

t2405: clarify test descriptions and simplify test

Philippe Blain committed over 6 years ago

t2405: use git -C and test_commit -C instead of subshells

Philippe Blain committed over 6 years ago

t7410: rename to t2405-worktree-submodule.sh

Philippe Blain committed over 6 years ago

docs: mention when increasing http.postBuffer is valuable

brian m. carlson committed over 6 years ago

doc: dissuade users from trying to ignore tracked files

brian m. carlson committed over 6 years ago

doc: provide guidance on user.name format

brian m. carlson committed over 6 years ago

docs: expand on possible and recommended user config options

brian m. carlson committed over 6 years ago

doc: move author and committer information to git-commit(1)

brian m. carlson committed over 6 years ago

l10n: Update Catalan translation

Jordi Mas committed over 6 years ago

templates: fix deprecated type option `--bool`

Lucius Hu committed over 6 years ago

t6025: use helpers to replace test -f <path>

Shourya Shukla committed over 6 years ago

t6025: modernize style

Shourya Shukla committed over 6 years ago

doc: rm: synchronize <pathspec> description

Alexandr Miloslavskiy committed over 6 years ago

docs: use "currently" for the present time

brian m. carlson committed over 6 years ago

fetch: document and test --refmap=""

Derrick Stolee committed over 6 years ago

t3404: directly test the behavior of interest

Elijah Newren committed over 6 years ago

git-rebase.txt: update description of --allow-empty-message

Elijah Newren committed over 6 years ago