summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-17 17:28:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-10-17 17:28:42 (GMT)
commit530d71011e358a43e8f8489e320081f49fe96c4f (patch)
tree30661cb313fd7cb4004189ccde3db4c3819bceee /git-rebase--merge.sh
parent352611fc2c3b6f833910043687ed441bf3fb79df (diff)
parent866f5f82b9fdedb0304708f9b78db1409fecd046 (diff)
downloadgit-530d71011e358a43e8f8489e320081f49fe96c4f.zip
git-530d71011e358a43e8f8489e320081f49fe96c4f.tar.gz
git-530d71011e358a43e8f8489e320081f49fe96c4f.tar.bz2
Merge branch 'nd/doc-ignore' into maint
* nd/doc-ignore: gitignore.txt: suggestions how to get literal # or ! at the beginning
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions