]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/init-defaultbranch-advice'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Dec 2020 23:15:17 +0000 (15:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Dec 2020 23:15:17 +0000 (15:15 -0800)
Our users are going to be trained to prepare for future change of
init.defaultBranch configuration variable.

* js/init-defaultbranch-advice:
  init: provide useful advice about init.defaultBranch
  get_default_branch_name(): prepare for showing some advice
  branch -m: allow renaming a yet-unborn branch
  init: document `init.defaultBranch` better

1  2 
builtin/branch.c
builtin/clone.c
remote.c
t/test-lib-functions.sh

Simple merge
diff --cc builtin/clone.c
Simple merge
diff --cc remote.c
Simple merge
Simple merge