From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Dec 2017 19:16:21 +0000 (-0800)
Subject: Merge branch 'lb/rebase-i-short-command-names'
X-Git-Tag: v2.16.0-rc0~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0da2ba4880f971de2782f2d4cfcd68f9148d2860;p=git

Merge branch 'lb/rebase-i-short-command-names'

With a configuration variable rebase.abbreviateCommands set,
"git rebase -i" produces the todo list with a single-letter
command names.

* lb/rebase-i-short-command-names:
  sequencer.c: drop 'const' from function return type
  t3404: add test case for abbreviated commands
  rebase -i: learn to abbreviate command names
  rebase -i -x: add exec commands via the rebase--helper
  rebase -i: update functions to use a flags parameter
  rebase -i: replace reference to sha1 with oid
  rebase -i: refactor transform_todo_ids
  rebase -i: set commit to null in exec commands
  Documentation: use preferred name for the 'todo list' script
  Documentation: move rebase.* configs to new file
---

0da2ba4880f971de2782f2d4cfcd68f9148d2860