mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-30 06:42:15 +02:00
Code
5d75a52b3a
git/contrib/examples
History
Jonathan Nieder 5d75a52b3a merge script: merge -X<option> 
Without this support, the scripted merge cannot pass t6037.

Based on v1.7.0-rc0~55^2~5 (git merge -X<option>, 2009-11-25).

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-08-18 14:02:04 -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
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: merge -X<option> 2010-08-18 14:02:04 -07:00
git-notes.sh Builtin-ify git-notes 2010-02-13 19:36:13 -08:00
git-remote.perl
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
git-verify-tag.sh
README

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.