summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorMichael Rappazzo <rappazzo@gmail.com>2015-06-13 16:26:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-15 18:42:58 (GMT)
commit16cf51c7a2e82f27577bb1bdcdc013c34815803e (patch)
tree3401b5762913fc10a6297ec6ca4511f7df4e12b0 /git-rebase--merge.sh
parent7974889a053574e449b55ca543a486e38e74864f (diff)
downloadgit-16cf51c7a2e82f27577bb1bdcdc013c34815803e.zip
git-16cf51c7a2e82f27577bb1bdcdc013c34815803e.tar.gz
git-16cf51c7a2e82f27577bb1bdcdc013c34815803e.tar.bz2
git-rebase--interactive.sh: add config option for custom instruction format
A config option 'rebase.instructionFormat' can override the default 'oneline' format of the rebase instruction list. Since the list is parsed using the left, right or boundary mark plus the sha1, they are prepended to the instruction format. Signed-off-by: Michael Rappazzo <rappazzo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions