<feed xmlns='http://www.w3.org/2005/Atom'>
<title>git/contrib/examples, branch v1.7.2</title>
<subtitle>Mirror of https://git.kernel.org/pub/scm/git/git.git/
</subtitle>
<id>https://git.shady.money/git/atom?h=v1.7.2</id>
<link rel='self' href='https://git.shady.money/git/atom?h=v1.7.2'/>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/'/>
<updated>2010-04-19T23:34:49Z</updated>
<entry>
<title>Honor "tagopt = --tags" configuration option</title>
<updated>2010-04-19T23:34:49Z</updated>
<author>
<name>Samuel Tardieu</name>
<email>sam@rfc1149.net</email>
</author>
<published>2010-04-19T23:31:25Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=944163a4bd4cc4c35392147d10020ba57c6d7d87'/>
<id>urn:sha1:944163a4bd4cc4c35392147d10020ba57c6d7d87</id>
<content type='text'>
If the "tagopt = --tags" option of a remote is set, all tags
will be fetched as in "git fetch --tags".

Signed-off-by: Samuel Tardieu &lt;sam@rfc1149.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>Builtin-ify git-notes</title>
<updated>2010-02-14T03:36:13Z</updated>
<author>
<name>Johan Herland</name>
<email>johan@herland.net</email>
</author>
<published>2010-02-13T21:28:20Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=cd067d3bf4ea3f89969cd143be3e281e1c5ac58a'/>
<id>urn:sha1:cd067d3bf4ea3f89969cd143be3e281e1c5ac58a</id>
<content type='text'>
The builtin-ification includes some minor behavioural changes to the
command-line interface: It is no longer allowed to mix the -m and -F
arguments, and it is not allowed to use multiple -F options.

As part of the builtin-ification, we add the commit_notes() function
to the builtin API. This function (together with the notes.h API) can
be easily used from other builtins to manipulate the notes tree.

Also includes needed changes to t3301.

This patch has been improved by the following contributions:
- Stephen Boyd: Use die() instead of fprintf(stderr, ...) followed by exit(1)

Cc: Stephen Boyd &lt;bebarino@gmail.com&gt;
Signed-off-by: Johan Herland &lt;johan@herland.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>git merge -X&lt;option&gt;</title>
<updated>2010-01-18T06:45:06Z</updated>
<author>
<name>Avery Pennarun</name>
<email>apenwarr@gmail.com</email>
</author>
<published>2009-11-26T02:23:55Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=8cc5b29065e19267cbc08b39c34674b02c2e3d59'/>
<id>urn:sha1:8cc5b29065e19267cbc08b39c34674b02c2e3d59</id>
<content type='text'>
Teach "-X &lt;option&gt;" command line argument to "git merge" that is passed to
strategy implementations.  "ours" and "theirs" autoresolution introduced
by the previous commit can be asked to the recursive strategy.

Signed-off-by: Avery Pennarun &lt;apenwarr@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>Merge branch 'jn/help-everywhere'</title>
<updated>2009-11-21T07:44:52Z</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2009-11-21T07:44:52Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=750054cd3f1298bc9e113a47eaa6346923e08c19'/>
<id>urn:sha1:750054cd3f1298bc9e113a47eaa6346923e08c19</id>
<content type='text'>
* jn/help-everywhere: (23 commits)
  diff --no-index: make the usage string less scary
  merge-{recursive,subtree}: use usagef() to print usage
  Introduce usagef() that takes a printf-style format
  Let 'git &lt;command&gt; -h' show usage without a git dir
  Show usage string for 'git http-push -h'
  Let 'git http-fetch -h' show usage outside any git repository
  Show usage string for 'git stripspace -h'
  Show usage string for 'git unpack-file -h'
  Show usage string for 'git show-index -h'
  Show usage string for 'git rev-parse -h'
  Show usage string for 'git merge-one-file -h'
  Show usage string for 'git mailsplit -h'
  Show usage string for 'git imap-send -h'
  Show usage string for 'git get-tar-commit-id -h'
  Show usage string for 'git fast-import -h'
  Show usage string for 'git check-ref-format -h'
  http-fetch: add missing initialization of argv0_path
  Show usage string for 'git show-ref -h'
  Show usage string for 'git merge-ours -h'
  Show usage string for 'git commit-tree -h'
  ...

Conflicts:
	imap-send.c
</content>
</entry>
<entry>
<title>Retire fetch--tool helper to contrib/examples</title>
<updated>2009-11-10T01:08:44Z</updated>
<author>
<name>Jonathan Nieder</name>
<email>jrnieder@gmail.com</email>
</author>
<published>2009-11-09T15:04:41Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=fe9a215214acd2cf9132aec70e0758786a6e3e8b'/>
<id>urn:sha1:fe9a215214acd2cf9132aec70e0758786a6e3e8b</id>
<content type='text'>
When git-fetch was builtin-ized, the previous script was moved to
contrib/examples.  Now, it is the sole remaining user for
'git fetch--tool'.

The fetch--tool code is still worth keeping around so people can
try out the old git-fetch.sh, for example when investigating
regressions from the builtinifaction.

Signed-off-by: Jonathan Nieder &lt;jrnieder@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>Use 'fast-forward' all over the place</title>
<updated>2009-10-25T06:50:28Z</updated>
<author>
<name>Felipe Contreras</name>
<email>felipe.contreras@gmail.com</email>
</author>
<published>2009-10-24T08:31:32Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=a75d7b54097ef0d0945cbe673a9940d6c561f95c'/>
<id>urn:sha1:a75d7b54097ef0d0945cbe673a9940d6c561f95c</id>
<content type='text'>
It's a compound word.

Signed-off-by: Felipe Contreras &lt;felipe.contreras@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>Fix typo in contrib/examples/git-svnimport.txt</title>
<updated>2009-02-25T16:33:14Z</updated>
<author>
<name>Michael J Gruber</name>
<email>git@drmicha.warpmail.net</email>
</author>
<published>2009-02-25T14:05:17Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=3dbe1165e9facec3497b3da744b832788a47957e'/>
<id>urn:sha1:3dbe1165e9facec3497b3da744b832788a47957e</id>
<content type='text'>
Signed-off-by: Michael J Gruber &lt;git@drmicha.warpmail.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>Convert git-* invocations to "git *" in the svnimport example.</title>
<updated>2009-02-25T05:10:57Z</updated>
<author>
<name>Abhijit Menon-Sen</name>
<email>ams@toroid.org</email>
</author>
<published>2009-02-25T03:03:14Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=3ca936422212370481850d67cab80b1e517b2d80'/>
<id>urn:sha1:3ca936422212370481850d67cab80b1e517b2d80</id>
<content type='text'>
After these changes, git-svnimport worked fine for me.

Signed-off-by: Abhijit Menon-Sen &lt;ams@toroid.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>contrib/examples/README: give an explanation of the status of these files</title>
<updated>2009-01-13T01:47:36Z</updated>
<author>
<name>jidanni@jidanni.org</name>
<email>jidanni@jidanni.org</email>
</author>
<published>2009-01-13T01:19:42Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=47a845bfc3a9e1d378c43c3b3ea4291d5d79eca8'/>
<id>urn:sha1:47a845bfc3a9e1d378c43c3b3ea4291d5d79eca8</id>
<content type='text'>
We attempt to give an explanation of the status of the files in this
directory.

Signed-off-by: jidanni &lt;jidanni@jidanni.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>Typo "does not exists" when git remote update remote.</title>
<updated>2008-10-16T15:20:15Z</updated>
<author>
<name>Mikael Magnusson</name>
<email>mikachu@gmail.com</email>
</author>
<published>2008-09-19T13:48:08Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=6c2a6022dbc5879f5d6c267925408e484be6214a'/>
<id>urn:sha1:6c2a6022dbc5879f5d6c267925408e484be6214a</id>
<content type='text'>
</content>
</entry>
</feed>
