![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 9 Nov 2006 23:08:19 +0000 (15:08 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 9 Nov 2006 23:08:19 +0000 (15:08 -0800) | ||
| commit | 368c2ac249ac2261784e1b9b9bc7c98c5e859052 | |
| tree | 6576c6616785ebad6d6dc4a296f4baaf691254f8 | tree | snapshot |
| parent | 18d5453ed36331b3f4123afae6c1c6bb4ef4d0a5 | commit | diff |
| parent | a6ec3c1599f990b4f2f3dab2606688639f74d844 | commit | diff |
Merge branch 'maint'
* maint:
git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
git-svn: fix dcommit losing changes when out-of-date from svn
git-svn: don't die on rebuild when --upgrade is specified
git-svn: avoid printing filenames of files we're not tracking
* maint:
git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
git-svn: fix dcommit losing changes when out-of-date from svn
git-svn: don't die on rebuild when --upgrade is specified
git-svn: avoid printing filenames of files we're not tracking