Merge in xonotic/xonotic.git: matthiaskrgr/gitignore
git-manager created issue #1676 on 2013-06-13T20:47:44Z:
Purpose of the branch:
add xonstat repos to gitignore
Repository: xonotic/xonotic.git Commit: 48837fe0 Branch: matthiaskrgr/gitignore
Merge commands:
cd .
git checkout master
git reset --hard origin/master
git pull && git diff '48837fe02a59a2118276e26aef3ba076590788da'..'origin/matthiaskrgr/gitignore'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --no-ff 'origin/matthiaskrgr/gitignore'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'matthiaskrgr/gitignore'
Diffstat:
.gitignore | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
Revision log:
commit 48837fe02a59a2118276e26aef3ba076590788da
Merge: 8caa9ad eae3784
Author: Matthias Krüger
Commit: Matthias Krüger
Merge branch 'master' into matthiaskrgr/gitignore
commit 8caa9ad5b75ea402e4bb01a3df8193d30a68d86d
Merge: 3cb85d5 deb8e46
Author: Matthias Krüger
Commit: Matthias Krüger
Merge branch 'master' into matthiaskrgr/gitignore
commit 3cb85d51ba48c17be864c73986150b6beb14df87
Author: Matthias Krüger
Commit: Matthias Krüger
gitignore: add repos "xonstat" and "xonstatdb".
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/.gitignore b/.gitignore
index d88f3ff..71bda24 100644
— a/.gitignore
**+ b/.gitignore
@ -9,3 +9,5
@
**.yes
**.no
/data.old/
*/xonstat/
+/xonstatdb/