<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/git.git, branch tl/userdiff-csharp-async</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>userdiff.c: add C# async keyword in diff pattern</title>
<updated>2018-03-08T19:03:32+00:00</updated>
<author>
<name>Thomas Levesque</name>
<email>thomas.levesque@gmail.com</email>
</author>
<published>2018-03-08T11:05:32+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=a12cec99f8b64a0b99ae6f8a7e4724039406aea3'/>
<id>a12cec99f8b64a0b99ae6f8a7e4724039406aea3</id>
<content type='text'>
Currently C# async methods are not shown in diff hunk headers. I just
added the async keyword to the csharp method pattern so that they are
properly detected.

Signed-off-by: Thomas Levesque &lt;thomas.levesque@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>
Currently C# async methods are not shown in diff hunk headers. I just
added the async keyword to the csharp method pattern so that they are
properly detected.

Signed-off-by: Thomas Levesque &lt;thomas.levesque@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'ys/bisect-object-id-missing-conversion-fix' into maint</title>
<updated>2018-02-27T18:43:55+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2018-02-27T18:43:55+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=38e79b1fdab9244e1727d0698afcf3bb8956c0a4'/>
<id>38e79b1fdab9244e1727d0698afcf3bb8956c0a4</id>
<content type='text'>
Fix for a commented-out code to adjust it to a rather old API change.

* ys/bisect-object-id-missing-conversion-fix:
  bisect: debug: convert struct object to object_id
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fix for a commented-out code to adjust it to a rather old API change.

* ys/bisect-object-id-missing-conversion-fix:
  bisect: debug: convert struct object to object_id
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'sb/submodule-update-reset-fix' into maint</title>
<updated>2018-02-27T18:43:54+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2018-02-27T18:43:54+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=14890e916fca7d903332f9fed7fb36fb5715acb1'/>
<id>14890e916fca7d903332f9fed7fb36fb5715acb1</id>
<content type='text'>
When resetting the working tree files recursively, the working tree
of submodules are now also reset to match.

* sb/submodule-update-reset-fix:
  submodule: submodule_move_head omits old argument in forced case
  unpack-trees: oneway_merge to update submodules
  t/lib-submodule-update.sh: fix test ignoring ignored files in submodules
  t/lib-submodule-update.sh: clarify test
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
When resetting the working tree files recursively, the working tree
of submodules are now also reset to match.

* sb/submodule-update-reset-fix:
  submodule: submodule_move_head omits old argument in forced case
  unpack-trees: oneway_merge to update submodules
  t/lib-submodule-update.sh: fix test ignoring ignored files in submodules
  t/lib-submodule-update.sh: clarify test
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'ab/commit-m-with-fixup' into maint</title>
<updated>2018-02-27T18:43:54+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2018-02-27T18:43:54+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=c1ab3b8a44149a8dfb8968a958b13ac9e8d9579a'/>
<id>c1ab3b8a44149a8dfb8968a958b13ac9e8d9579a</id>
<content type='text'>
"git commit --fixup" did not allow "-m&lt;message&gt;" option to be used
at the same time; allow it to annotate resulting commit with more
text.

* ab/commit-m-with-fixup:
  commit: add support for --fixup &lt;commit&gt; -m"&lt;extra message&gt;"
  commit doc: document that -c, -C, -F and --fixup with -m error
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
"git commit --fixup" did not allow "-m&lt;message&gt;" option to be used
at the same time; allow it to annotate resulting commit with more
text.

* ab/commit-m-with-fixup:
  commit: add support for --fixup &lt;commit&gt; -m"&lt;extra message&gt;"
  commit doc: document that -c, -C, -F and --fixup with -m error
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'nd/ita-wt-renames-in-status' into maint</title>
<updated>2018-02-27T18:39:35+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2018-02-27T18:39:34+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=12accdc023f2b62109860cb745bdd1827b2c22de'/>
<id>12accdc023f2b62109860cb745bdd1827b2c22de</id>
<content type='text'>
"git status" after moving a path in the working tree (hence making
it appear "removed") and then adding with the -N option (hence
making that appear "added") detected it as a rename, but did not
report the  old and new pathnames correctly.

* nd/ita-wt-renames-in-status:
  wt-status.c: handle worktree renames
  wt-status.c: rename rename-related fields in wt_status_change_data
  wt-status.c: catch unhandled diff status codes
  wt-status.c: coding style fix
  Use DIFF_DETECT_RENAME for detect_rename assignments
  t2203: test status output with porcelain v2 format
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
"git status" after moving a path in the working tree (hence making
it appear "removed") and then adding with the -N option (hence
making that appear "added") detected it as a rename, but did not
report the  old and new pathnames correctly.

* nd/ita-wt-renames-in-status:
  wt-status.c: handle worktree renames
  wt-status.c: rename rename-related fields in wt_status_change_data
  wt-status.c: catch unhandled diff status codes
  wt-status.c: coding style fix
  Use DIFF_DETECT_RENAME for detect_rename assignments
  t2203: test status output with porcelain v2 format
</pre>
</div>
</content>
</entry>
<entry>
<title>Git 2.16.2</title>
<updated>2018-02-15T23:21:23+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2018-02-15T23:21:23+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=ffa952497288d29d94b16675c6789ef83850def3'/>
<id>ffa952497288d29d94b16675c6789ef83850def3</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 'ab/doc-cat-file-e-still-shows-errors' into maint</title>
<updated>2018-02-15T23:18:15+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2018-02-15T23:18:15+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=c93150cfb02257b38d0f8abcafc7de5908afbb3b'/>
<id>c93150cfb02257b38d0f8abcafc7de5908afbb3b</id>
<content type='text'>
Doc update.

* ab/doc-cat-file-e-still-shows-errors:
  cat-file doc: document that -e will return some output
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Doc update.

* ab/doc-cat-file-e-still-shows-errors:
  cat-file doc: document that -e will return some output
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'as/read-tree-prefix-doc-fix' into maint</title>
<updated>2018-02-15T23:18:14+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2018-02-15T23:18:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=d4e528ef6a00b2176e69e426be0da19c86577ffc'/>
<id>d4e528ef6a00b2176e69e426be0da19c86577ffc</id>
<content type='text'>
Doc update.

* as/read-tree-prefix-doc-fix:
  doc/read-tree: remove obsolete remark
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Doc update.

* as/read-tree-prefix-doc-fix:
  doc/read-tree: remove obsolete remark
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'nd/add-i-ignore-submodules' into maint</title>
<updated>2018-02-15T23:18:13+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2018-02-15T23:18:13+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=2409e1035c6c81416f97bc8997ff1bd8cfb94f98'/>
<id>2409e1035c6c81416f97bc8997ff1bd8cfb94f98</id>
<content type='text'>
"git add -p" was taught to ignore local changes to submodules as
they do not interfere with the partial addition of regular changes
anyway.

* nd/add-i-ignore-submodules:
  add--interactive: ignore submodule changes except HEAD
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
"git add -p" was taught to ignore local changes to submodules as
they do not interfere with the partial addition of regular changes
anyway.

* nd/add-i-ignore-submodules:
  add--interactive: ignore submodule changes except HEAD
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'tg/stash-with-pathspec-fix' into maint</title>
<updated>2018-02-15T23:18:13+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2018-02-15T23:18:13+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=984c8337de2e2d610d36426226c08a14b43af23f'/>
<id>984c8337de2e2d610d36426226c08a14b43af23f</id>
<content type='text'>
"git stash -- &lt;pathspec&gt;" incorrectly blew away untracked files in
the directory that matched the pathspec, which has been corrected.

* tg/stash-with-pathspec-fix:
  stash: don't delete untracked files that match pathspec
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
"git stash -- &lt;pathspec&gt;" incorrectly blew away untracked files in
the directory that matched the pathspec, which has been corrected.

* tg/stash-with-pathspec-fix:
  stash: don't delete untracked files that match pathspec
</pre>
</div>
</content>
</entry>
</feed>
