summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-10-03 10:05:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-10-03 10:05:39 (GMT)
commit9b0185ca06001219f5ffcccb5c09b9a9bb42e7c2 (patch)
treeb25e282c2248e5a079b56e95607f0509422e062a /Documentation/git-merge.txt
parent0341091a9ec47576a2fdfab181145fa94c04b810 (diff)
parent73697a0b572f7f216d8355d83bf69e9b42e9a077 (diff)
downloadgit-9b0185ca06001219f5ffcccb5c09b9a9bb42e7c2.zip
git-9b0185ca06001219f5ffcccb5c09b9a9bb42e7c2.tar.gz
git-9b0185ca06001219f5ffcccb5c09b9a9bb42e7c2.tar.bz2
Merge branch 'js/rebase-i'
* js/rebase-i: rebase -i: work on a detached HEAD
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions