]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2cd91ec fbd7a23)
Merge branch 'nd/rebase-show-current-patch'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2018 22:54:02 +0000 (14:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2018 22:54:02 +0000 (14:54 -0800)
commit9ca488c04bdab90668471640baeb0d9140be064c
tree6a1e4c6acaff06f234b12fdbb0b4ad9ab3bc8048tree | snapshot
parent2cd91ec1970bd89e6b4b79b5aa41f27435625e71commit | diff
parentfbd7a23237094c3fb2e249bbcacbbf1e858e79c9commit | 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
Documentation/git-am.txt diff1 | diff2 | blob | history
Documentation/git-rebase.txt diff1 | diff2 | blob | history
builtin/am.c diff1 | diff2 | blob | history
contrib/completion/git-completion.bash diff1 | diff2 | blob | history
git-rebase--am.sh diff1 | diff2 | blob | history
git-rebase--interactive.sh diff1 | diff2 | blob | history
git-rebase--merge.sh diff1 | diff2 | blob | history
git-rebase.sh diff1 | diff2 | blob | history
sequencer.c diff1 | diff2 | blob | history
t/t3404-rebase-interactive.sh diff1 | diff2 | blob | history
t/t4150-am.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.