summaryrefslogtreecommitdiff
path: root/builtin-rev-list.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-12-24 00:14:14 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-12-24 00:14:14 -0800
commit768c728e7c706ab8d39e0dbf2aa4d1a465930728 (patch)
treea7d70a6b0a276027339339bdd4511f471c700bee /builtin-rev-list.c
parentt9129: skip the last three tests if UTF-8 locale is not available (diff)
parentrebase -i -p: leave a --cc patch when a merge could not be redone (diff)
downloadtgif-768c728e7c706ab8d39e0dbf2aa4d1a465930728.tar.xz
Merge branch 'js/rebase-i-p'
* js/rebase-i-p: rebase -i -p: leave a --cc patch when a merge could not be redone rebase -i -p: Fix --continue after a merge could not be redone Show a failure of rebase -p if the merge had a conflict
Diffstat (limited to 'builtin-rev-list.c')
0 files changed, 0 insertions, 0 deletions