]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a0ab573 629444a)
Merge branch 'mg/sequencer-untranslate-reflog'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2022 21:55:13 +0000 (14:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2022 21:55:13 +0000 (14:55 -0700)
commitb014a4416a9eef145d359d41771f1ebe030a1fbb
treed96cf2ebd15442cf77c80e67f9f18934e4e630b9tree | snapshot
parenta0ab573bb1157bee2d5567c9fc22ff96a4d8c6bbcommit | diff
parent629444ad45b08618157b3e46431433125f730894commit | diff
Merge branch 'mg/sequencer-untranslate-reflog'

The sequencer machinery translated messages left in the reflog by
mistake, which has been corrected.

* mg/sequencer-untranslate-reflog:
  sequencer: do not translate command names
  sequencer: do not translate parameters to error_resolve_conflict()
  sequencer: do not translate reflog messages
Unnamed repository; edit this file 'description' to name the repository.