Public Git Hosting - debian-git.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: e30a217 bd4c77e)

commit	68901d569e39b8cf4bbb5c9892dfec42ffb52b58
author	Jonathan Nieder <jrnieder@gmail.com>
	Fri, 16 Dec 2011 11:29:03 +0000 (16 05:29 -0600)
committer	Jonathan Nieder <jrnieder@gmail.com>
	Fri, 16 Dec 2011 11:29:03 +0000 (16 05:29 -0600)
tree	e294ac47e90259a61ed6e9793e1afd53e453fac3	tree \| snapshot (tar.gz zip)
parent	e30a217dfdc16ac42870819fa7ba5484730f097c	commit \| diff
parent	bd4c77e0c695fd72e34c69d11f15451aa2349ac1	commit \| diff

Merge branch 'debian-experimental' into debian-sid

Conflicts:
GIT-VERSION-GEN
Makefile
RelNotes
builtin/fetch.c
debian/changelog
debian/changelog.upstream
debian/versions.upstream

15 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
builtin/apply.c	diff1 \|	diff2 \|	blob \| history
builtin/blame.c	diff1 \|	diff2 \|	blob \| history
builtin/checkout.c	diff1 \|	diff2 \|	blob \| history
builtin/fetch.c	diff1 \|	diff2 \|	blob \| history
builtin/merge.c	diff1 \|	diff2 \|	blob \| history
builtin/name-rev.c	diff1 \|	diff2 \|	blob \| history
compat/mingw.c	diff1 \|	diff2 \|	blob \| history
compat/mingw.h	diff1 \|	diff2 \|	blob \| history
debian/changelog	diff1 \|	diff2 \|	blob \| history
debian/changelog.upstream	diff1 \|	diff2 \|	blob \| history
debian/versions.upstream	diff1 \|	diff2 \|	blob \| history
git-am.sh	diff1 \|	diff2 \|	blob \| history
notes-merge.c	diff1 \|	diff2 \|	blob \| history
submodule.c	diff1 \|	diff2 \|	blob \| history

A mirror of smarden.org's http git