On Tue, May 29, 2018 at 05:20:29PM -0400, Jeff King wrote: > Thanks. There's one bit missing here, because it did not cause a textual > conflict during the rebase (but it's now dead code). Patch below (to be > squashed to the tip of jk/branch-l-1-removal). > [...] > - if (used_deprecated_reflog_option) { > - if (list) { > - warning("the '-l' option is an alias for '--create-reflog' and"); > - warning("has no effect in list mode. This option will soon be"); > - warning("removed and you should omit it (or use '--list' instead)."); > - } else { > - warning("the '-l' alias for '--create-reflog' is deprecated;"); > - warning("it will be removed in a future version of Git"); > - } > - } > - Oh, and did we want to mark these for translation on the step 0 branch? Obviously that would impact this hunk. -Peff