]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7b11728 71076d0)
Merge branch 'ah/advice-pull-has-no-preference-between-rebase-and-merge'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Dec 2021 22:35:09 +0000 (14:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Dec 2021 22:35:09 +0000 (14:35 -0800)
commit8e715503f1c57c43808ac63881e69cb51b08c145
tree3ff12eb3b01a11a5b08f916df96b84bf6325eefctree | snapshot
parent7b11728a7b7e1f7fbdc261eae533f9ef4cac093fcommit | diff
parent71076d0edde43a7672a9a0f555753ff078602a64commit | diff
Merge branch 'ah/advice-pull-has-no-preference-between-rebase-and-merge'

The advice message given by "git pull" when the user hasn't made a
choice between merge and rebase still said that the merge is the
default, which no longer is the case.  This has been corrected.

* ah/advice-pull-has-no-preference-between-rebase-and-merge:
  pull: don't say that merge is "the default strategy"
builtin/pull.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.