projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6c77376 fbd7a23)
Merge branch 'nd/rebase-show-current-patch' into jch
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Feb 2018 21:04:43 +0000 (13:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Feb 2018 21:04:43 +0000 (13:04 -0800)
commit4e1dc541a5ccb03c0becf057603e33af04e91f0a
treead5b2778713eae82354846bf92f2d1b6863ab838tree | snapshot
parent6c77376ba7ed59e138958dc46d428c1ab77fbc08commit | diff
parentfbd7a23237094c3fb2e249bbcacbbf1e858e79c9commit | diff
Merge branch 'nd/rebase-show-current-patch' into jch

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.