diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-03-07 01:54:02 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-07 01:54:02 +0300 |
commit | 9ca488c04bdab90668471640baeb0d9140be064c (patch) | |
tree | 6a1e4c6acaff06f234b12fdbb0b4ad9ab3bc8048 /contrib | |
parent | 2cd91ec1970bd89e6b4b79b5aa41f27435625e71 (diff) | |
parent | fbd7a23237094c3fb2e249bbcacbbf1e858e79c9 (diff) |
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 'contrib')
-rw-r--r-- | contrib/completion/git-completion.bash | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 4c86ab66e23..91536d831c8 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -439,7 +439,7 @@ __git_refs () track="" ;; *) - for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD; do + for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD; do case "$i" in $match*) if [ -e "$dir/$i" ]; then @@ -1077,7 +1077,7 @@ _git_am () { __git_find_repo_path if [ -d "$__git_repo_path"/rebase-apply ]; then - __gitcomp "--skip --continue --resolved --abort --quit" + __gitcomp "--skip --continue --resolved --abort --quit --show-current-patch" return fi case "$cur" in @@ -1992,11 +1992,11 @@ _git_rebase () { __git_find_repo_path if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then - __gitcomp "--continue --skip --abort --quit --edit-todo" + __gitcomp "--continue --skip --abort --quit --edit-todo --show-current-patch" return elif [ -d "$__git_repo_path"/rebase-apply ] || \ [ -d "$__git_repo_path"/rebase-merge ]; then - __gitcomp "--continue --skip --abort --quit" + __gitcomp "--continue --skip --abort --quit --show-current-patch" return fi __git_complete_strategy && return |