summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-12-24 08:14:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-12-24 08:14:14 (GMT)
commit768c728e7c706ab8d39e0dbf2aa4d1a465930728 (patch)
treea7d70a6b0a276027339339bdd4511f471c700bee /Documentation/git.txt
parentc66c0cbc7e55409ac934b7c6e89aa7aafa74ede4 (diff)
parent4fb1a19d502f4a2ca47bfb75cce605f3447819e6 (diff)
downloadgit-768c728e7c706ab8d39e0dbf2aa4d1a465930728.zip
git-768c728e7c706ab8d39e0dbf2aa4d1a465930728.tar.gz
git-768c728e7c706ab8d39e0dbf2aa4d1a465930728.tar.bz2
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 'Documentation/git.txt')
0 files changed, 0 insertions, 0 deletions