<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/git.git, branch pl/complete-diff-submodule-diff</title>
<subtitle>github.com: git/git.git
</subtitle>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/'/>
<entry>
<title>Completion: Add support for --submodule=diff</title>
<updated>2017-01-30T23:04:22+00:00</updated>
<author>
<name>Peter Law</name>
<email>PeterJCLaw@gmail.com</email>
</author>
<published>2016-12-04T14:41:27+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=462f213429c728d68e5178580040af5832fa0bb8'/>
<id>462f213429c728d68e5178580040af5832fa0bb8</id>
<content type='text'>
Teach git-completion.bash about the 'diff' option to 'git diff
--submodule=', which was added in Git 2.11.

Signed-off-by: Peter Law &lt;PeterJCLaw@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Teach git-completion.bash about the 'diff' option to 'git diff
--submodule=', which was added in Git 2.11.

Signed-off-by: Peter Law &lt;PeterJCLaw@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Seventh batch for 2.12</title>
<updated>2017-01-24T00:00:40+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2017-01-24T00:00:40+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=4e59582ff70d299f5a88449891e78d15b4b3fabe'/>
<id>4e59582ff70d299f5a88449891e78d15b4b3fabe</id>
<content type='text'>
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'ws/request-pull-code-cleanup'</title>
<updated>2017-01-23T23:59:23+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2017-01-23T23:59:23+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=71db0cf0c7558968bba5e8920821eda54e74b6cf'/>
<id>71db0cf0c7558968bba5e8920821eda54e74b6cf</id>
<content type='text'>
Code clean-up.

* ws/request-pull-code-cleanup:
  request-pull: drop old USAGE stuff
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Code clean-up.

* ws/request-pull-code-cleanup:
  request-pull: drop old USAGE stuff
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'rh/diff-orderfile-doc'</title>
<updated>2017-01-23T23:59:23+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2017-01-23T23:59:23+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=831bd5e775ad5225f2a98eba738f69148cd50e0a'/>
<id>831bd5e775ad5225f2a98eba738f69148cd50e0a</id>
<content type='text'>
Documentation fix.

* rh/diff-orderfile-doc:
  diff: document the format of the -O (diff.orderFile) file
  diff: document behavior of relative diff.orderFile
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Documentation fix.

* rh/diff-orderfile-doc:
  diff: document the format of the -O (diff.orderFile) file
  diff: document behavior of relative diff.orderFile
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'sb/cd-then-git-can-be-written-as-git-c'</title>
<updated>2017-01-23T23:59:22+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2017-01-23T23:59:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=e11c8261ba70f16b86ec662c027c9be649d9aea4'/>
<id>e11c8261ba70f16b86ec662c027c9be649d9aea4</id>
<content type='text'>
Test clean-up.

* sb/cd-then-git-can-be-written-as-git-c:
  lib-submodule-update.sh: reduce use of subshell by using "git -C"
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Test clean-up.

* sb/cd-then-git-can-be-written-as-git-c:
  lib-submodule-update.sh: reduce use of subshell by using "git -C"
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'ad/bisect-terms'</title>
<updated>2017-01-23T23:59:22+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2017-01-23T23:59:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=e94577039564ace7b7fb8186d170ea7350f55e4c'/>
<id>e94577039564ace7b7fb8186d170ea7350f55e4c</id>
<content type='text'>
Documentation fix.

* ad/bisect-terms:
  Documentation/bisect: improve on (bad|new) and (good|bad)
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Documentation fix.

* ad/bisect-terms:
  Documentation/bisect: improve on (bad|new) and (good|bad)
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'sg/fix-versioncmp-with-common-suffix'</title>
<updated>2017-01-23T23:59:21+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2017-01-23T23:59:21+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=1ac244d5b20a9ea4a640e2ee80b9818f564aa237'/>
<id>1ac244d5b20a9ea4a640e2ee80b9818f564aa237</id>
<content type='text'>
The prereleaseSuffix feature of version comparison that is used in
"git tag -l" did not correctly when two or more prereleases for the
same release were present (e.g. when 2.0, 2.0-beta1, and 2.0-beta2
are there and the code needs to compare 2.0-beta1 and 2.0-beta2).

* sg/fix-versioncmp-with-common-suffix:
  versioncmp: generalize version sort suffix reordering
  versioncmp: factor out helper for suffix matching
  versioncmp: use earliest-longest contained suffix to determine sorting order
  versioncmp: cope with common part overlapping with prerelease suffix
  versioncmp: pass full tagnames to swap_prereleases()
  t7004-tag: add version sort tests to show prerelease reordering issues
  t7004-tag: use test_config helper
  t7004-tag: delete unnecessary tags with test_when_finished
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
The prereleaseSuffix feature of version comparison that is used in
"git tag -l" did not correctly when two or more prereleases for the
same release were present (e.g. when 2.0, 2.0-beta1, and 2.0-beta2
are there and the code needs to compare 2.0-beta1 and 2.0-beta2).

* sg/fix-versioncmp-with-common-suffix:
  versioncmp: generalize version sort suffix reordering
  versioncmp: factor out helper for suffix matching
  versioncmp: use earliest-longest contained suffix to determine sorting order
  versioncmp: cope with common part overlapping with prerelease suffix
  versioncmp: pass full tagnames to swap_prereleases()
  t7004-tag: add version sort tests to show prerelease reordering issues
  t7004-tag: use test_config helper
  t7004-tag: delete unnecessary tags with test_when_finished
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'vn/diff-ihc-config'</title>
<updated>2017-01-23T23:59:21+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2017-01-23T23:59:21+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=8ec68d1ae2863823b74d67c5e92297e38bbf97bc'/>
<id>8ec68d1ae2863823b74d67c5e92297e38bbf97bc</id>
<content type='text'>
"git diff" learned diff.interHunkContext configuration variable
that gives the default value for its --inter-hunk-context option.

* vn/diff-ihc-config:
  diff: add interhunk context config option
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
"git diff" learned diff.interHunkContext configuration variable
that gives the default value for its --inter-hunk-context option.

* vn/diff-ihc-config:
  diff: add interhunk context config option
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'sb/submodule-init'</title>
<updated>2017-01-23T23:59:21+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2017-01-23T23:59:21+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=e801be066cc12799cd053a5b4eb792d9007133fc'/>
<id>e801be066cc12799cd053a5b4eb792d9007133fc</id>
<content type='text'>
Error message fix.

* sb/submodule-init:
  submodule update --init: display correct path from submodule
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Error message fix.

* sb/submodule-init:
  submodule update --init: display correct path from submodule
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'sb/submodule-embed-gitdir'</title>
<updated>2017-01-23T23:59:20+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2017-01-23T23:59:20+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=9dc7f78149407cf2659d4ea6295bad88313b2899'/>
<id>9dc7f78149407cf2659d4ea6295bad88313b2899</id>
<content type='text'>
Help-text fix.

* sb/submodule-embed-gitdir:
  submodule absorbgitdirs: mention in docstring help
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Help-text fix.

* sb/submodule-embed-gitdir:
  submodule absorbgitdirs: mention in docstring help
</pre>
</div>
</content>
</entry>
</feed>
