我经常使用git rebase -i命令,希望能找到一种加快此过程的方法。
例如,我想编辑git历史记录中第二个最新的提交。 可以使用以下命令:
git rebase -i HEAD~2
...然后将提交设置为“e”并保存。
我更喜欢能够像这样做:
git rebase edit HEAD~2
这种方式可以使用rebase吗?
git rebase -i
会调用两个不同的编辑器。更准确地说,它首先在pick
命令集上调用序列编辑器,然后在您将pick
更改为edit
或reword
的文件上调用核心编辑器。$GIT_SEQUENCE_EDITOR
(如果已设置),或git config --get sequence.editor
,或使用标准回退。核心编辑器取自$GIT_EDITOR
(如果已设置),或git config --get core.editor
,或使用标准回退。$VISUAL
,如果未设置,则使用$EDITOR
,如果未设置,则使用编译的默认值(通常为vi
或vim
)。git-sh-setup
中的部分内容),我编写了以下完全未经测试的脚本来reword(而不是修订)提交。显然,您可以很容易地改进它以允许修改(编辑)提交。#! /bin/sh
#
# git-reword: use git rebase -i to reword one particular commit
SUBDIRECTORY_OK=Yes
USAGE="<commit>"
. $(git --exec-path)/git-sh-setup
case $# in
1) ;;
*) usage;;
esac
rev=$(git rev-parse "$1") || exit 1
# We now know which commit to reword; find it relative to HEAD,
# and find the parent argument to pass to "git rebase -i".
# If we wanted to allow multiple rewords we would need to sort
# them topologically so as to find the correct parent argument.
# "git rev-list --no-walk --topo-order <rev> <rev> ..." can do this
# now, but watch out, older rev-lists do not apply the sort if there
# are specific revisions listed on the command line.
if ! git merge-base --is-ancestor $rev HEAD; then
fatal "$1 is not an ancestor of HEAD, cannot reword by rebasing"
fi
# Is it the root commit? Are there merges between it and HEAD?
if parent=$(git rev-parse -q --verify ${rev}^); then
# it has a (first) parent, so don't need --root
nmerge=$(git rev-list --count --merges $parent..HEAD)
else
# it has no first parent, so use --root instead
parent="--root"
nmerge=$(git rev-list --count --merges HEAD)
fi
# Refuse to run if there are merges. This is partly a matter
# of taste since we could attempt to combine -i and -p (since
# we are not deleting any pick lines) but it's definitely safer
# to refuse to re-do merges: we don't know if there are evil
# merges, for instance, nor want to force manual re-merges.
if [ $nmerge -gt 0 ]; then
[ $nmerge -gt 1 ] && msg="are $nmerge merges" || msg="is a merge"
fatal "Cannot reword: there $msg in the way."
fi
require_clean_work_tree "reword" "Please commit or stash them."
# If we allowed merges, the pick line we want might not be
# the very first pick command; but we don't, so it is, so
# that makes our "editor" pretty easy.
# If we want to allow multiple reword hashes, change this
# to write a script that reads each line and matches SHA-1s
# (we need to expand them a la git-rebase--interactive and
# then match them against the IDs we'd like to reword).
TF=$(mktemp)
trap "rm -f $TF" 0 1 2 3 15
cat << END > $TF
#! /bin/sh
# change first line from "pick ..." to "reword ..."
# copy the remaining lines unchanged
sed -e '1s/^pick/reword/'
END
chmod +x $TF
GIT_SEQUENCE_EDITOR=$TF git rebase -i $parent
git log
的问题:请参见“git rebase -i
shows wrong commit history after a rebase and force push”。请使用 Git 2.24+(2019年第四季度)。 - VonC