From: William Clifford Date: Fri, 05 Sep 2014 08:40:01 GMT Subject: [PATCH/RFC 1/2] Add sequence.format to interactive rebase Message-ID: <861trli9lb.fsf@gmail.com> Allow user to customize the format of commit table in interactive rebase todo file. Short hashes are still required to be the second column so these are added to the format if not already present. Defaults to oneline as before. Signed-off-by: William Clifford Signed-off-by: Matthew Boeh --- git-rebase--interactive.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index b64dd28..ba1f4b8 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -961,7 +961,19 @@ else revisions=$onto...$orig_head shortrevisions=$shorthead fi -git rev-list $merges_option --pretty=oneline --abbrev-commit \ + +if test -z "$GIT_SEQUENCE_FORMAT" +then + GIT_SEQUENCE_FORMAT="$(git config sequence.format)" +fi +if test -n "$GIT_SEQUENCE_FORMAT" +then + if test "$GIT_SEQUENCE_FORMAT" = "${GIT_SEQUENCE_FORMAT#>%h}" + then + GIT_SEQUENCE_FORMAT=">%h $GIT_SEQUENCE_FORMAT" + fi +fi +git rev-list $merges_option --pretty="${GIT_SEQUENCE_FORMAT:-oneline}" --abbrev-commit \ --abbrev=7 --reverse --left-right --topo-order \ $revisions ${restrict_revision+^$restrict_revision} | \ sed -n "s/^>//p" | -- William Clifford