]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e69dccf) | patch
merge script: forbid merge -s index
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 17 Aug 2010 07:06:06 +0000 (02:06 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:02:04 +0000 (14:02 -0700)
commitf5d3a6f575b12af88561ad5a3b1fc8f866f49056
tree17c76b73b9eecf9452135ea56dabf2e678974524tree | snapshot
parente69dccf8cd4576be804597b2960aa7d0020a65dbcommit | diff
merge script: forbid merge -s index

Some git-merge-* commands are not merge strategies.  This is based on
v1.6.1-rc1~294^2~7 (builtin-merge: allow using a custom strategy,
2008-07-30) but it is less smart: we just use a hard-coded list of
forbidden strategy names.  It is okay if this falls out of date, since
the code is just an example.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/examples/git-merge.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.