git push

https://stackoverflow.com/questions/24114676/git-error-failed-to-push-some-refs-to

If the GitHub repo has seen new commits pushed to it, while you were working locally, I would advice for:

git pull –rebase
git push
The full syntax is:

git pull –rebase origin master
git push origin master
That way, you would replay (the –rebase part) your local commits on top of the newly updated origin/master (or origin/yourBranch: git pull origin yourBranch).

See a more complete example in the chapter 6 Pull with rebase of the Git Pocket Book.

I would recommend a:

git push -u origin master
That would establish a tracking relationship between your local master branch and its upstream branch.
After that, any future push for that branch can be done with a simple:

git push
See “Why do I need to explicitly push a new branch?”.

Since the OP already reset and redone its commit on top of origin/master:

git reset –mixed origin/master
git add .
git commit -m “This is a new commit for what I originally planned to be amended”
git push origin master
There is no need to pull –rebase.

Note: git reset –mixed origin/master can also be written git reset origin/master, since the –mixed option is the default one when using git reset.

emacs 25 centos

https://gist.github.com/binarytemple-clients/0a936a9eb81db558da9b

$ sudo yum -y install libXpm-devel libjpeg-turbo-devel openjpeg-devel openjpeg2-devel turbojpeg-devel giflib-devel libtiff-devel gnutls-devel libxml2-devel GConf2-devel dbus-devel wxGTK-devel gtk3-devel
$ wget http://git.savannah.gnu.org/cgit/emacs.git/snapshot/emacs-25.1.tar.gz
$ tar zxvf emacs-25.1.tar.gz
$ cd emacs-25.1
$ ./autogen
$ ./configure –without-makeinfo # incase makeinfo is not available on your system: Example Centos 7 else ./configure would do
$ sudo make install

verify installation

$ which emacs
$ emacs –version
GNU Emacs 25.1.1

docker phpldapadmin

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
docker pull rroemhild/test-openldap
docker run --privileged -d -p 389:389 rroemhild/test-openldap


git clone https://github.com/ramons03/djangoldapsample.git


python manage.py runserver

docker run --env PHPLDAPADMIN_HTTPS=false --detach osixia/phpldapadmin:0.6.12
docker run -p 6800:80 --env PHPLDAPADMIN_LDAP_HOSTS=172.17.0.2,PHPLDAPADMIN_HTTPS=false --detach osixia/phpldapadmin:0.6.12


docker run -p 6443:443 \
--env PHPLDAPADMIN_LDAP_HOSTS=172.17.0.2 \
--detach osixia/phpldapadmin:0.6.12


docker run -p 6443:443 env PHPLDAPADMIN_LDAP_HOSTS=172.17.0.2 --hostname 192.168.0.114 --detach osixia/phpldapadmin:0.6.12


docker run -p 6443:443,6800:80 --env PHPLDAPADMIN_LDAP_HOSTS=172.17.0.2 --env PHPLDAPADMIN_HTTPS=false --detach osixia/phpldapadmin:0.6.12

docker run -p 6800:80 --env PHPLDAPADMIN_LDAP_HOSTS=172.17.0.2 --env PHPLDAPADMIN_HTTPS=false --detach osixia/phpldapadmin:0.6.12

http://pissedoffadmins.com/nagios/nagios-error-could-not-stat-command-file-usrlocalnagiosvarrwnagios-cmd.html