diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-06 22:54:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-06 22:54:02 (GMT) |
| commit | 9ca488c04bdab90668471640baeb0d9140be064c (patch) | |
| tree | 6a1e4c6acaff06f234b12fdbb0b4ad9ab3bc8048 /git-rebase--merge.sh | |
| parent | 2cd91ec1970bd89e6b4b79b5aa41f27435625e71 (diff) | |
| parent | fbd7a23237094c3fb2e249bbcacbbf1e858e79c9 (diff) | |
| download | git-9ca488c04bdab90668471640baeb0d9140be064c.zip git-9ca488c04bdab90668471640baeb0d9140be064c.tar.gz git-9ca488c04bdab90668471640baeb0d9140be064c.tar.bz2 | |
Merge branch 'nd/rebase-show-current-patch'
The new "--show-current-patch" option gives an end-user facing way
to get the diff being applied when "git rebase" (and "git am")
stops with a conflict.
* nd/rebase-show-current-patch:
rebase: introduce and use pseudo-ref REBASE_HEAD
rebase: add --show-current-patch
am: add --show-current-patch
Diffstat (limited to 'git-rebase--merge.sh')
| -rw-r--r-- | git-rebase--merge.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index 1831e58..ceb7154 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -58,6 +58,7 @@ call_merge () { echo "$msgnum" >"$state_dir/msgnum" cmt="$(cat "$state_dir/cmt.$msgnum")" echo "$cmt" > "$state_dir/current" + git update-ref REBASE_HEAD "$cmt" hd=$(git rev-parse --verify HEAD) cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD) eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"' @@ -138,11 +139,15 @@ skip) finish_rb_merge return ;; +show-current-patch) + exec git show REBASE_HEAD -- + ;; esac mkdir -p "$state_dir" echo "$onto_name" > "$state_dir/onto_name" write_basic_state +rm -f "$(git rev-parse --git-path REBASE_HEAD)" msgnum=0 for cmt in $(git rev-list --reverse --no-merges "$revisions") |