]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'zh/format-patch-fractional-reroll-count'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Apr 2021 21:43:14 +0000 (14:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Apr 2021 21:43:14 +0000 (14:43 -0700)
"git format-patch -v<n>" learned to allow a reroll count that is
not an integer.

* zh/format-patch-fractional-reroll-count:
  format-patch: allow a non-integral version numbers

1  2 
Documentation/git-format-patch.txt
builtin/log.c
revision.h

Simple merge
diff --cc builtin/log.c
Simple merge
diff --cc revision.h
Simple merge