diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-11-07 00:14:53 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-11-07 00:14:53 +0000 |
| commit | 641eeadd77583420e7ad32d6a0414a24f4fc83bb (patch) | |
| tree | ce8800f1d680c667e398265865de79e3922a49d4 /debian | |
| parent | e7bf758b02322662a888d347d13243501d109b74 (diff) | |
| parent | 631c9e09a7fd22a5847173978c3d1357c1db74ea (diff) | |
Merge branch 'master' into wip.remote
Conflicts:
debian/changelog
dgit
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index a8f074d..f57b4ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,18 @@ dgit (0.18~experimental2) experimental; urgency=low * Merge in accidentally-dropped changes from 0.17~experimental7. + * Merge bugfix from master (unstable/testing) branch. -- +dgit (0.17) unstable; urgency=high + + * Do not grobble around in .git/refs/; instead, use git-show-ref. + This avoids breaking when git makes packed refs. Closes:728893. + * Clarify error message for missing refs/remotes/dgit/dgit/<suite>. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Thu, 07 Nov 2013 00:02:47 +0000 + dgit (0.18~experimental1) experimental; urgency=low * No update to code. |