psyc-mirrors/psyced
1
0
Fork 0
mirror of git://git.psyced.org/git/psyced synced 2024-08-15 03:25:10 +00:00
Code Issues 2 Releases Wiki Activity

+

Browse source
This commit is contained in:
psyc://psyced.org/~lynX 2009-04-22 03:57:17 +02:00
parent 4d1f8e4eda
commit 2e2e8e70dd
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bin/psyconf
View file

@ -489,6 +489,10 @@ fi
if test "\$1" = "-m"
then
# git is seriously unsuited for this job. we need to "check in" the changes
# to file permissions etc or otherwise we can't update things at all...
(cd $base && git commit -a -m 'automatic by psyced -m')
# merging will of course fail.. sigh
(cd $base && git merge -s resolve origin)
exit
fi