Skip to content

Instantly share code, notes, and snippets.

Created November 4, 2015 15:26
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
Star You must be signed in to star a gist
Save anonymous/a205c1f98ae25102ea8e to your computer and use it in GitHub Desktop.
a, b, x & y
on X:
$ git pull origin develop
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 5 (delta 4), reused 0 (delta 0)
Unpacking objects: 100% (5/5), done.
From ssh://ip/~/git_dev_repos/site.com
* branch develop -> FETCH_HEAD
Merge made by the 'recursive' strategy.
application/views/chart_view.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
$ git push origin develop
Counting objects: 14, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (8/8), done.
Writing objects: 100% (8/8), 791 bytes, done.
Total 8 (delta 6), reused 0 (delta 0)
To ssh://ip/~/git_dev_repos/site.com.git
acde7cb..a2154a3 develop -> develop
on B:
$ git pull origin develop
From /var/www/domains/git_dev_repos/site.com
* branch develop -> FETCH_HEAD
Merge made by the 'recursive' strategy.
application/views/chart_view.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
$ git branch -v
* develop 15c32f2 Merge branch 'develop' of /var/www/domains/git_dev_repos/site.com into develop
master bd5f116 [behind 1] rm cached files
$ cd /var/www/domains/git_dev_repos/site.com.git/
$ git branch -v
develop cd2ba97 updated dummy file
* master daa48e9 added favicon ref
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment