diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-08-20 07:56:41 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-08-20 07:56:41 -0700 |
| commit | c9bb9f076c51b9467f5d7ee61399f0ad54e8eac8 (patch) | |
| tree | d9a6a96bd648fb28a2474e3e92e2e7b6c5d73c80 | |
| parent | 45a82ac2b744e26e1ded1fd23b93bc944bfd87e6 (diff) | |
git patch header -> debian patch header
| -rw-r--r-- | debian/patches/0004-pass-allow-unrelated-histories-to-git-merge.patch | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/debian/patches/0004-pass-allow-unrelated-histories-to-git-merge.patch b/debian/patches/0004-pass-allow-unrelated-histories-to-git-merge.patch index 76edcc00..9e8f486e 100644 --- a/debian/patches/0004-pass-allow-unrelated-histories-to-git-merge.patch +++ b/debian/patches/0004-pass-allow-unrelated-histories-to-git-merge.patch @@ -1,7 +1,6 @@ -From 3f0c8a5158e61ea1c4fcb39a71803208104cd3ac Mon Sep 17 00:00:00 2001 -From: Sean Whitton <spwhitton@spwhitton.name> -Date: Sat, 20 Aug 2016 07:27:04 -0700 -Subject: [PATCH] pass --allow-unrelated-histories to git merge +Description: fix for git 2.9 +Author: Sean Whitton <spwhitton@spwhitton.name> +Forwarded: yes Fixes merging the /usr/src/propellor git bundle with git 2.9. --- |