git/contrib/examples at 2a70fa4f1e377bc68bcabdc1a550e9970acccda7 - git

mirror of https://github.com/git-for-windows/git.git synced 2026-07-02 20:29:15 -05:00

Files

Jonathan Nieder 2a70fa4f1e merge script: handle --no-ff --no-commit correctly

In a --no-ff merge with conflicts, "git commit" used to forget the
--no-ff when used to complete the merge.  That was fixed by
v1.6.1-rc1~134^2 (builtin-commit: use reduce_heads() only when
appropriate, 2008-10-03) for the builtin merge.  Port the change to
the merge script in contrib/examples.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2010-08-18 14:02:05 -07:00

builtin-fetch--tool.c

Merge branch 'jn/help-everywhere'

2009-11-20 23:44:52 -08:00

git-checkout.sh

…

git-clean.sh

…

git-clone.sh

…

git-commit.sh

Replace uses of "git-var" with "git var"

2008-07-30 11:42:01 -07:00

git-fetch.sh

Honor "tagopt = --tags" configuration option

2010-04-19 16:34:49 -07:00

git-gc.sh

…

git-ls-remote.sh

…

git-merge-ours.sh

…

git-merge.sh

merge script: handle --no-ff --no-commit correctly

2010-08-18 14:02:05 -07:00

git-notes.sh

Builtin-ify git-notes

2010-02-13 19:36:13 -08:00

git-remote.perl

Typo "does not exists" when git remote update remote.

2008-10-16 08:20:15 -07:00

git-rerere.perl

…

git-reset.sh

…

git-resolve.sh

Use 'fast-forward' all over the place

2009-10-24 23:50:28 -07:00

git-revert.sh

…

git-svnimport.perl

Convert git-* invocations to "git *" in the svnimport example.

2009-02-24 21:10:57 -08:00

git-svnimport.txt

Fix typo in contrib/examples/git-svnimport.txt

2009-02-25 08:33:14 -08:00

git-tag.sh

Replace uses of "git-var" with "git var"

2008-07-30 11:42:01 -07:00

git-verify-tag.sh

…

README

contrib/examples/README: give an explanation of the status of these files

2009-01-12 17:47:36 -08:00

README

These are original scripted implementations, kept primarily for their
reference value to any aspiring plumbing users who want to learn how
pieces can be fit together.