<feed xmlns='http://www.w3.org/2005/Atom'>
<title>git-bz, branch master</title>
<subtitle>git-bz</subtitle>
<link rel='alternate' type='text/html' href='http://thewalter.net/git/cgit.cgi/git-bz/'/>
<entry>
<title>Fix typo: Uncommment =&gt; uncomment</title>
<updated>2013-02-14T14:50:45+00:00</updated>
<author>
<name>Owen W. Taylor</name>
<email>otaylor@fishsoup.net</email>
</author>
<published>2013-02-14T14:50:45+00:00</published>
<link rel='alternate' type='text/html' href='http://thewalter.net/git/cgit.cgi/git-bz/commit/?id=83860382728e08e804bd12e5190570d18658caf0'/>
<id>83860382728e08e804bd12e5190570d18658caf0</id>
<content type='text'>
Pointed out by Dan Winship
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Pointed out by Dan Winship
</pre>
</div>
</content>
</entry>
<entry>
<title>Add support for epiphany 3.6</title>
<updated>2012-08-07T16:24:36+00:00</updated>
<author>
<name>Bastien Nocera</name>
<email>hadess@hadess.net</email>
</author>
<published>2012-05-17T14:12:25+00:00</published>
<link rel='alternate' type='text/html' href='http://thewalter.net/git/cgit.cgi/git-bz/commit/?id=1b23d76725f35555f2853ea7f5349651bdade2a4'/>
<id>1b23d76725f35555f2853ea7f5349651bdade2a4</id>
<content type='text'>
Cookie jar got migrated from ~/.gnome2/epiphany to ~/.config/epiphany

https://bugzilla.gnome.org/show_bug.cgi?id=676241
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Cookie jar got migrated from ~/.gnome2/epiphany to ~/.config/epiphany

https://bugzilla.gnome.org/show_bug.cgi?id=676241
</pre>
</div>
</content>
</entry>
<entry>
<title>attach: Obsolete patches with the same subject</title>
<updated>2012-03-13T16:29:10+00:00</updated>
<author>
<name>Jasper St. Pierre</name>
<email>jstpierre@mecheye.net</email>
</author>
<published>2012-03-12T20:27:35+00:00</published>
<link rel='alternate' type='text/html' href='http://thewalter.net/git/cgit.cgi/git-bz/commit/?id=1cef6f1875462583e57d1543f313d4b4c585149f'/>
<id>1cef6f1875462583e57d1543f313d4b4c585149f</id>
<content type='text'>
For plain 'git bz attach', always obsolete existing patches if they
have the same subject as the commit being attached.

For 'git bz attach -e', make this the default.

https://bugzilla.gnome.org/show_bug.cgi?id=671941
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
For plain 'git bz attach', always obsolete existing patches if they
have the same subject as the commit being attached.

For 'git bz attach -e', make this the default.

https://bugzilla.gnome.org/show_bug.cgi?id=671941
</pre>
</div>
</content>
</entry>
<entry>
<title>apply: fix typo</title>
<updated>2012-03-01T20:46:09+00:00</updated>
<author>
<name>Owen W. Taylor</name>
<email>otaylor@fishsoup.net</email>
</author>
<published>2012-03-01T20:46:09+00:00</published>
<link rel='alternate' type='text/html' href='http://thewalter.net/git/cgit.cgi/git-bz/commit/?id=31088e0d0ef177358831363f547084c76f8e8451'/>
<id>31088e0d0ef177358831363f547084c76f8e8451</id>
<content type='text'>
""" not """"
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
""" not """"
</pre>
</div>
</content>
</entry>
<entry>
<title>apply: Fix addition of 'need commit message' string</title>
<updated>2012-03-01T20:35:57+00:00</updated>
<author>
<name>Owen W. Taylor</name>
<email>otaylor@fishsoup.net</email>
</author>
<published>2012-03-01T20:35:57+00:00</published>
<link rel='alternate' type='text/html' href='http://thewalter.net/git/cgit.cgi/git-bz/commit/?id=be420c97d3918216f49eb91f396bfc2795de5d59'/>
<id>be420c97d3918216f49eb91f396bfc2795de5d59</id>
<content type='text'>
Fix a double addition of the commit message, and add a comment
pointing out that the exact string is checked by git.gnome.org.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fix a double addition of the commit message, and add a comment
pointing out that the exact string is checked by git.gnome.org.
</pre>
</div>
</content>
</entry>
<entry>
<title>apply: ask the user to double-check author and subject</title>
<updated>2012-03-01T20:31:33+00:00</updated>
<author>
<name>Owen W. Taylor</name>
<email>otaylor@fishsoup.net</email>
</author>
<published>2012-03-01T20:31:33+00:00</published>
<link rel='alternate' type='text/html' href='http://thewalter.net/git/cgit.cgi/git-bz/commit/?id=e1ad70be73ebf563735dd854075169bd10a9360b'/>
<id>e1ad70be73ebf563735dd854075169bd10a9360b</id>
<content type='text'>
The author and subject might be wrong (especially the subject), when
we make up a commit message for a plain patch, so ask the user to
double check.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
The author and subject might be wrong (especially the subject), when
we make up a commit message for a plain patch, so ask the user to
double check.
</pre>
</div>
</content>
</entry>
<entry>
<title>apply: pass _interactive=True when running 'git commit --amend'</title>
<updated>2012-03-01T20:30:04+00:00</updated>
<author>
<name>Owen W. Taylor</name>
<email>otaylor@fishsoup.net</email>
</author>
<published>2012-03-01T20:30:04+00:00</published>
<link rel='alternate' type='text/html' href='http://thewalter.net/git/cgit.cgi/git-bz/commit/?id=9f46b5b3b6d80fa76b33849c1b70eca9195d9145'/>
<id>9f46b5b3b6d80fa76b33849c1b70eca9195d9145</id>
<content type='text'>
If the editor uses the terminal, the missing _interactive=True will
cause things to hang.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
If the editor uses the terminal, the missing _interactive=True will
cause things to hang.
</pre>
</div>
</content>
</entry>
<entry>
<title>apply: attempt to handle plain diffs</title>
<updated>2012-03-01T18:52:04+00:00</updated>
<author>
<name>Dan Winship</name>
<email>danw@gnome.org</email>
</author>
<published>2011-08-02T14:57:48+00:00</published>
<link rel='alternate' type='text/html' href='http://thewalter.net/git/cgit.cgi/git-bz/commit/?id=f69a952c5d66fcd2da40d125374608c04f39960b'/>
<id>f69a952c5d66fcd2da40d125374608c04f39960b</id>
<content type='text'>
If a bug has a plain diff (as opposed to git-format-patch output),
prepend some minimal headers to it to get it into a format git-am will
accept, and then make the user write a commit message for it before
proceeding.

https://bugzilla.gnome.org/show_bug.cgi?id=657558
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
If a bug has a plain diff (as opposed to git-format-patch output),
prepend some minimal headers to it to get it into a format git-am will
accept, and then make the user write a commit message for it before
proceeding.

https://bugzilla.gnome.org/show_bug.cgi?id=657558
</pre>
</div>
</content>
</entry>
<entry>
<title>apply: add --continue/--skip/--abort</title>
<updated>2012-03-01T18:25:53+00:00</updated>
<author>
<name>Dan Winship</name>
<email>danw@gnome.org</email>
</author>
<published>2011-07-09T14:56:30+00:00</published>
<link rel='alternate' type='text/html' href='http://thewalter.net/git/cgit.cgi/git-bz/commit/?id=ce11237046a1af9728f7d0544c6aae8eb1d5c7d3'/>
<id>ce11237046a1af9728f7d0544c6aae8eb1d5c7d3</id>
<content type='text'>
Rather than failing completely when git-am fails to apply a patch,
write out our current state to git-am's temporary directory, and then
tell the user to use "git bz apply --continue/--skip/--abort" after
handling the merge failure. When the user uses one of those options,
read back our state, pass the flag on to git-am, and (assuming git-am
succeeds), continue with the next patch.

https://bugzilla.gnome.org/show_bug.cgi?id=657558
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Rather than failing completely when git-am fails to apply a patch,
write out our current state to git-am's temporary directory, and then
tell the user to use "git bz apply --continue/--skip/--abort" after
handling the merge failure. When the user uses one of those options,
read back our state, pass the flag on to git-am, and (assuming git-am
succeeds), continue with the next patch.

https://bugzilla.gnome.org/show_bug.cgi?id=657558
</pre>
</div>
</content>
</entry>
<entry>
<title>apply: add interactive option</title>
<updated>2012-03-01T18:24:46+00:00</updated>
<author>
<name>Dan Winship</name>
<email>danw@gnome.org</email>
</author>
<published>2011-07-09T18:10:50+00:00</published>
<link rel='alternate' type='text/html' href='http://thewalter.net/git/cgit.cgi/git-bz/commit/?id=e422eea9999a02262d3bad996879378ce1824541'/>
<id>e422eea9999a02262d3bad996879378ce1824541</id>
<content type='text'>
Rather than asking whether or not to apply each patch individually,
list all of the patches at once and allow the user to either apply all
of them, apply none of them, or interactively choose which ones to
apply (a la interactive rebasing).

In addition to choosing which patches to apply, the interactive option
also allows reordering the patches before applying, and choosing to
apply committed or rejected patches.

https://bugzilla.gnome.org/show_bug.cgi?id=657558
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Rather than asking whether or not to apply each patch individually,
list all of the patches at once and allow the user to either apply all
of them, apply none of them, or interactively choose which ones to
apply (a la interactive rebasing).

In addition to choosing which patches to apply, the interactive option
also allows reordering the patches before applying, and choosing to
apply committed or rejected patches.

https://bugzilla.gnome.org/show_bug.cgi?id=657558
</pre>
</div>
</content>
</entry>
</feed>
