mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
2a70fa4f1e377bc68bcabdc1a550e9970acccda7
git/contrib/examples
History
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
Merge branch 'db/checkout'
2008-02-27 12:53:26 -08:00
git-clean.sh
Make git-clean a builtin
2007-11-18 19:11:42 -08:00
git-clone.sh
Merge branch 'db/clone-in-c'
2008-05-25 13:41:37 -07:00
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
Supplant the "while case ... break ;; esac" idiom
2007-09-23 16:12:00 -07:00
git-ls-remote.sh
Build in ls-remote
2007-11-05 12:25:42 -08:00
git-merge-ours.sh
Merge branch 'maint'
2007-11-28 17:06:57 -08:00
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
Resurrect git-rerere to contrib/examples
2008-03-16 01:11:07 -07:00
git-reset.sh
Merge branch 'maint'
2007-09-23 17:13:55 -07:00
git-resolve.sh
Use 'fast-forward' all over the place
2009-10-24 23:50:28 -07:00
git-revert.sh
contrib: resurrect scripted git-revert.
2007-12-26 17:38:00 -08:00
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
Supplant the "while case ... break ;; esac" idiom
2007-09-23 16:12:00 -07:00
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.