From cbe9b9899035e0cc6b6354b1f1212ec2d20dd9f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xe=CC=81fir=20Destiny?= <xefir@crystalyx.net>
Date: Thu, 27 Mar 2014 16:38:09 +0100
Subject: [PATCH] Resolved force push

---
 .gitignore | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 ajax.php   |  2 +-
 2 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index ee6ac59..c8a2ee1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,68 @@
+## Mac OSX
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must ends with two \r.
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+## Linux
+
+*~
+
+# KDE directory preferences
+.directory
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
+
+## Directory-based project format
+.idea/
+
+## File-based project format
+*.ipr
+*.iws
+*.iml
+
+## Additional for IntelliJ
+out/
+
+# generated by mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# generated by JIRA plugin
+atlassian-ide-plugin.xml
+
+# generated by Crashlytics plugin (for Android Studio and Intellij)
+com_crashlytics_export_strings.xml
+
+## Specific
+
 /nbproject/private/
 /config.php
-.idea
 .htaccess
-.htpasswd
\ No newline at end of file
+.htpasswd
diff --git a/ajax.php b/ajax.php
index 7a0b96e..7a81796 100644
--- a/ajax.php
+++ b/ajax.php
@@ -43,7 +43,7 @@ if (!empty($_POST['action'])) {
 			exit;
 		} else if ($_POST['action'] == 'push') {
 			$message = empty($_POST['message']) ? 'FTP' : str_replace(array('"', "'"), ' ', stripslashes($_POST['message']));
-			echo ansi2html($session->exec('bash -c \'cd ' . $config['path'] . ' && git add -A && git commit -m "' . $message . '" && git push && ' . $gitstatus . "'"));
+			echo ansi2html($session->exec('bash -c \'cd ' . $config['path'] . ' && git add -A && git commit -m "' . $message . '" && git push && git push && ' . $gitstatus . "'"));
 			exit;
 		} else if ($_POST['action'] == 'pull') {
 			echo ansi2html($session->exec('bash -c \'cd ' . $config['path'] . ' && git pull && ' . $gitstatus . "'"));