[git-users] Can't ssh to the host after installing gitosis

2013-06-25 Thread Lee Wong


In the process, I issued gitosis-init FILENAME.pub with root and delete 
/root/repositories. Then i did everything done. But when i ssh to the host 
today,it reports

PTY allocation request failed on channel 0 ERROR:gitosis.app:Configuration 
does not exist: [Errno 2] No such file or directory: '/root/.gitosis.conf'

I wonder what can i do? It's really urgent.Please help!

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.




Re: [git-users] Applying patch to Drupal module

2013-06-25 Thread Ben Alcantara
I'm using terminal but i've gone to the directory via the ftp command. How 
would I apply this patch via SSH, is it similar commands like FTP?

On Tuesday, 25 June 2013 01:32:43 UTC+10, Peter J Weisberg wrote:

 On Jun 24, 2013 8:20 AM, Konstantin Khomoutov 
 flat...@users.sourceforge.net javascript: wrote:
 
  On Mon, 24 Jun 2013 08:08:49 -0700
  PJ Weisberg pjwei...@gmail.com javascript: wrote:
 
  [...]
 
   Are you trying to run git commands inside an ftp client, rather than
   in a shell?
  
   Try !git apply example.patch.  Not just for Git, but for any
   commands you want to run on the remote machine.
 
  Sorry, but what is this supposed to mean?  In a typical interactive
  Unix shell that `!' would re-execute the last command which name
  begins with the string git.  Did you mean FTP client then?  But since
  when FTP started to support remote command execution?
 
  The `sftp` program of the OpenSSH suite supports `!' prefix as a way to
  pass commands to a local shell rather than interpreting them, but the
  OP did not talk about SFTP but rather about FTP, and in any case it's
  a local shell which gets executed, not remote.

 Yeah, I remembered that immediately after I posted.  That function always 
 seemed odd to me--why would I log into a remote machine and run local 
 commands?--so I often forget that it works that way.

 And I'm trying to use an ftp client as if it were a remote shell is the 
 only interpretation of the OP's situation that made sense to me.  I didn't 
 watch the video, though.  ;-)


-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.




Re: [git-users] Applying patch to Drupal module

2013-06-25 Thread Konstantin Khomoutov
On Tue, 25 Jun 2013 06:10:11 -0700 (PDT)
Ben Alcantara ben.alcant...@gmail.com wrote:

 I'm using terminal but i've gone to the directory via the ftp
 command. How would I apply this patch via SSH, is it similar commands
 like FTP?

OK, I'm glad you decided to answer at least some of my questions.

No, FTP is not just a continuation of your shell -- while the interface
of a typical stock FTP client resembles that of the shell, it's not the
shell, and in particular FTP does not support execution of commands.

You basically have two options:

1) Install Git on the server.  Log into the server using SSH and hence
   get a *real* shell on the server.  Then you'll be able to execute any
   commands on the server (since you'll have a shell there).

   This options obviously requires SSH access to the server.
   And an administrator to install Git in it.

2) Somehow export a directory containing your repository either using
   a networking filesystem (NFS, SMB/CIFS or whatever) then mount it
   locally and work with the mounted directory using a local Git
   installation.

   If your local system is Linux-based you can mount a directory
   containing your Git repository onto your local system using
   SSHFS [1].  An upside of this is that it only requires SSH on the
   server.

Another, different, approach is to quit using Git on the server either
way and only perform deployment of a code which is ready to be deployed.
I mean, no fixups or Drupal module patching or whatnot is ever performed
directly on the server -- everything is done on a developer/sandbox
workstation, committed and then deployed on the server using a tool
like git-ftp [2] or rsync.

1. http://fuse.sourceforge.net/sshfs.html
2. https://github.com/git-ftp/git-ftp

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.




[git-users] Help on move the git repo directory from /opt/git to /passdev/git on unix server

2013-06-25 Thread Ling


Hello,

I'm about to move the git repository directory from current one: /opt/git 
to new one: /passdev/git.

And I got some question regards how to perform this?

First I will Shut down git and I tried to search online but I can't find 
any links on how to shutdown git? could you let me know what is the 
commands on how to shutdown the git?

Next is Copy /opt/git to /passdev/git? Is this the correct way to move the 
whole installation directory? 
Next Bring up git, what is the commands to bring up?
 
 
and also I had find out this link: 
http://gbayer.com/development/moving-files-from-one-git-repository-to-another-preserving-history/
 is 
for move the folders on one repository to another repository, so I was 
wondering since I'm going to move the whole repository folder into 
different location, so should I using git filter-branch 
--subdirectory-filter directory 1 -- --all to move each dirctory in one 
repo, or I can just using unix commands cp to move the whole repository 
folder?
 

Thanks
Ling

 

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.




Re: [git-users] Help on move the git repo directory from /opt/git to /passdev/git on unix server

2013-06-25 Thread Dale R. Worley
 From: Ling oylf1...@gmail.com
 
 I'm about to move the git repository directory from current one: /opt/git 
 to new one: /passdev/git.
 
 And I got some question regards how to perform this?
 
 First I will Shut down git and I tried to search online but I can't find 
 any links on how to shutdown git? could you let me know what is the 
 commands on how to shutdown the git?
 
 Next is Copy /opt/git to /passdev/git? Is this the correct way to move the 
 whole installation directory? 
 Next Bring up git, what is the commands to bring up?

My understanding is this:

There is no need to shut down Git, since Git doesn't *do* anything
unless someone executes a Git command that references that
repository.  Or rather, you shut down Git by telling everybody to
not use it until you get the repository moved.  However, if it is
accessed remotely by people you can't easily control, you may need to
shut down the access protocol's daemon to prevent the remote users
from executing Git commands while you move the repository.

Moving a repository is simple:  It contains no references to its
absolute location.  So all you have to do is move the entire directory
structure to the new place.

(I'm assuming here that the repository is a bare repository.)

One question is whether there are other repositories that reference
this one.  In that case, you have to update the configuration
information in the other repositories to point to the new location of
the master repository.

Dale

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.




Re: [git-users] Help on move the git repo directory from /opt/git to /passdev/git on unix server

2013-06-25 Thread lingfei ouyang
Thanks a lot for the fast response, Dale. That's all I need :).

Ling


On Tue, Jun 25, 2013 at 11:02 AM, Dale R. Worley wor...@alum.mit.eduwrote:

  From: Ling oylf1...@gmail.com
 
  I'm about to move the git repository directory from current one: /opt/git
  to new one: /passdev/git.
 
  And I got some question regards how to perform this?
 
  First I will Shut down git and I tried to search online but I can't find
  any links on how to shutdown git? could you let me know what is the
  commands on how to shutdown the git?
 
  Next is Copy /opt/git to /passdev/git? Is this the correct way to move
 the
  whole installation directory?
  Next Bring up git, what is the commands to bring up?

 My understanding is this:

 There is no need to shut down Git, since Git doesn't *do* anything
 unless someone executes a Git command that references that
 repository.  Or rather, you shut down Git by telling everybody to
 not use it until you get the repository moved.  However, if it is
 accessed remotely by people you can't easily control, you may need to
 shut down the access protocol's daemon to prevent the remote users
 from executing Git commands while you move the repository.

 Moving a repository is simple:  It contains no references to its
 absolute location.  So all you have to do is move the entire directory
 structure to the new place.

 (I'm assuming here that the repository is a bare repository.)

 One question is whether there are other repositories that reference
 this one.  In that case, you have to update the configuration
 information in the other repositories to point to the new location of
 the master repository.

 Dale

 --
 You received this message because you are subscribed to a topic in the
 Google Groups Git for human beings group.
 To unsubscribe from this topic, visit
 https://groups.google.com/d/topic/git-users/BzQnBYHqZFQ/unsubscribe.
 To unsubscribe from this group and all its topics, send an email to
 git-users+unsubscr...@googlegroups.com.
 For more options, visit https://groups.google.com/groups/opt_out.




-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.




Re: [git-users] Help on move the git repo directory from /opt/git to /passdev/git on unix server

2013-06-25 Thread lingfei ouyang
Hello Dale,

Just another quick question? Since after we move the git repo folders, how
I can check if the git is running correctly?

Thanks
Ling


On Tue, Jun 25, 2013 at 11:04 AM, lingfei ouyang oylf1...@gmail.com wrote:

 Thanks a lot for the fast response, Dale. That's all I need :).

 Ling


 On Tue, Jun 25, 2013 at 11:02 AM, Dale R. Worley wor...@alum.mit.eduwrote:

  From: Ling oylf1...@gmail.com
 
  I'm about to move the git repository directory from current one:
 /opt/git
  to new one: /passdev/git.
 
  And I got some question regards how to perform this?
 
  First I will Shut down git and I tried to search online but I can't find
  any links on how to shutdown git? could you let me know what is the
  commands on how to shutdown the git?
 
  Next is Copy /opt/git to /passdev/git? Is this the correct way to move
 the
  whole installation directory?
  Next Bring up git, what is the commands to bring up?

 My understanding is this:

 There is no need to shut down Git, since Git doesn't *do* anything
 unless someone executes a Git command that references that
 repository.  Or rather, you shut down Git by telling everybody to
 not use it until you get the repository moved.  However, if it is
 accessed remotely by people you can't easily control, you may need to
 shut down the access protocol's daemon to prevent the remote users
 from executing Git commands while you move the repository.

 Moving a repository is simple:  It contains no references to its
 absolute location.  So all you have to do is move the entire directory
 structure to the new place.

 (I'm assuming here that the repository is a bare repository.)

 One question is whether there are other repositories that reference
 this one.  In that case, you have to update the configuration
 information in the other repositories to point to the new location of
 the master repository.

 Dale

 --
 You received this message because you are subscribed to a topic in the
 Google Groups Git for human beings group.
 To unsubscribe from this topic, visit
 https://groups.google.com/d/topic/git-users/BzQnBYHqZFQ/unsubscribe.
 To unsubscribe from this group and all its topics, send an email to
 git-users+unsubscr...@googlegroups.com.
 For more options, visit https://groups.google.com/groups/opt_out.





-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.




Re: [git-users] Help on move the git repo directory from /opt/git to /passdev/git on unix server

2013-06-25 Thread Konstantin Khomoutov
On Tue, 25 Jun 2013 11:26:53 -0400
lingfei ouyang oylf1...@gmail.com wrote:

 Just another quick question? Since after we move the git repo
 folders, how I can check if the git is running correctly?

Uh... Clone the moved repo from a client?

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.




Re: [git-users] Help on move the git repo directory from /opt/git to /passdev/git on unix server

2013-06-25 Thread Magnus Therning
On Tue, Jun 25, 2013 at 07:43:14PM +0400, Konstantin Khomoutov wrote:
 On Tue, 25 Jun 2013 11:26:53 -0400
 lingfei ouyang oylf1...@gmail.com wrote:
 
  Just another quick question? Since after we move the git repo
  folders, how I can check if the git is running correctly?
 
 Uh... Clone the moved repo from a client?

Or run 'remote add' and 'fetch' in an existing work area.

/M

-- 
Magnus Therning  OpenPGP: 0xAB4DFBA4 
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe   http://therning.org/magnus

Most software today is very much like an Egyptian pyramid with
millions of bricks piled on top of each other, with no structural
integrity, but just done by brute force and thousands of slaves.
 -- Alan Kay


pgpJ9EZQFHT4O.pgp
Description: PGP signature


Re: [git-users] Help on move the git repo directory from /opt/git to /passdev/git on unix server

2013-06-25 Thread Dale R. Worley
 From: lingfei ouyang oylf1...@gmail.com
 
 Just another quick question? Since after we move the git repo folders, how
 I can check if the git is running correctly?

Well, you could just run any Git command and see if it works.

But one choice is to do git fsck with any arguments needed to make
it as comprehensive as possible.  If that passes, your repository is
probably in correct shape.

Dale

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.




[git-users] git5 patch error

2013-06-25 Thread Chris Sweeney
When I run git5 patch -c cl to patch I get the error below. I have tried 
from a fresh client, ensured I am tracking the proper folders, etc. with no 
luck. A colleague was able to run this command on the same CL successfully 
without issues. Has anybody come across this issue or have tips for how to 
fix it?

Here is the error:

g4: Error copying /home/szegedy/vs12/google3/learning/dist_belief/BUILD to 
/tmp/g4-111957/46003002/depot/google3/learning/dist_belief/BUILD
Traceback (most recent call last):
  File /dev/fd/63, line 241, in module

  File google3/devtools/git/git5/git5.py, line 158, in module
  File google3/devtools/git/git5/git5.py, line 146, in main
  File google3/devtools/git/git5/git5command.py, line 477, in 
ProtectedExecute
  File google3/devtools/git/git5/command/patch.py, line 532, in Execute
  File google3/devtools/git/git5/command/patch.py, line 472, in ReadG4Pack
  File google3/devtools/git/git5/common/pipeutil.py, line 58, in Wait
google3.devtools.git.git5.common.pipeutil.MyCalledProcessError: Command 
['/usr/bin/g4', 'pack', '-Na', '-v', '-c', '46003002'] ({'stdout': -1, 
'env': {'PARINIT': 'rTbgqR B=.?_A_a Q=_s|:', 'SESSION_MANAGER': 
'local/jphilbin2.lax.corp.google.com:@/tmp/.ICE-unix/4835,unix/jphilbin2.lax.corp.google.com:/tmp/.ICE-unix/4835',
 
'DBUS_SESSION_BUS_ADDRESS': 
'unix:abstract=/tmp/dbus-UpWzFxLFs7,guid=a5866a1a22a3252a4567cc820d34', 
'GNOME_KEYRING_PID': '4824', 'MAILCHECK': '604800', 'XDG_CONFIG_DIRS': 
'/etc/xdg/xdg-ubuntu:/etc/xdg', 'GNOME_DESKTOP_SESSION_ID': 
'this-is-deprecated', 'LESSCLOSE': '/usr/bin/lesspipe %s %s', 'CVS_RSH': 
'ssh', 'LESSOPEN': '| /usr/bin/lesspipe %s', 'XDG_CURRENT_DESKTOP': 
'Unity', 'SSH_AUTH_SOCK': '/tmp/ssh-PwVmLUme4835/agent.4835', 
'GNOME_KEYRING_CONTROL': '/tmp/keyring-fdzw8v', 'RSYNC_RSH': 'ssh', 'MAIL': 
'/dev/null', 'TERM': 'xterm', 'XDG_DATA_DIRS': 
'/usr/share/ubuntu:/usr/share/gnome:/usr/local/share/:/usr/share/', 
'SSH_AGENT_PID': '4910', 'GIT_CONFIG_NOGLOBAL': '1', 'HOME': 
'/usr/local/google/home/csweeney', 'GDMSESSION': 'ubuntu', 
'XDG_SESSION_COOKIE': 
'f1ebb51a48f5b8724c3b1fa901c6-1371679813.330241-1413872342', 'USER': 
'csweeney', 'GPG_AGENT_INFO': '/tmp/keyring-fdzw8v/gpg:0:1', 'DISPLAY': 
':0', 'PWD': '/usr/local/google/home/csweeney/projects/depth_regression', 
'DEFAULTS_PATH': '/usr/share/gconf/ubuntu.default.path', 'AUTO_PROXY': 
'https://proxyconfig.corp.google.com/proxy.pac', 'XDG_SEAT_PATH': 
'/org/freedesktop/DisplayManager/Seat0', 'SHLVL': '1', 'P4MERGE': 
'/google/src/files/head/depot/eng/perforce/mergep4.tcl', 'SHELL': 
'/bin/bash', 'PROMPT_COMMAND': '_eternal_history', 'LS_COLORS': 
'rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36:',
 
'P4DIFF': '/google/src/files/head/depot/google3/devtools/scripts/p4diff 
-w', 'PATH': 
'/usr/lib/lightdm/lightdm:/usr/lib/google-golang/bin:/usr/local/buildtools/java/jdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
 
'KRB5CCNAME': '/var/run/ccache/krb5cc_111957_plqSAw', 'UBUNTU_MENUPROXY': 
'libappmenu.so', 'LANGUAGE': 'en_US:', 'P4CONFIG': '.p4config', 
'DESKTOP_SESSION': 'ubuntu', 'WINDOWID': '48234502', 'COLORTERM': 
'gnome-terminal', 'MANDATORY_PATH': 
'/usr/share/gconf/ubuntu.mandatory.path', 'COMPIZ_CONFIG_PROFILE': 
'ubuntu', 'XDG_SESSION_PATH': '/org/freedesktop/DisplayManager/Session0', 
'GOOGLE3_NATIVE_CODE_DEPS_DSO': 
'/export/hda3/tmp/git5.runfiles-csweeney/d5f5119005ea86eb1eda368d2ba9a1e3/google3/devtools/git/git5/git5_swigdeps.so',
 
'PYTHONPATH': '/usr/local/buildtools/current/sitecustomize', 'XAUTHORITY': 
'/usr/local/google/home/csweeney/.Xauthority', 'LOGNAME': 'csweeney', 
'LANG': 'en_US.UTF-8'}}) returned non-zero exit status 1.

-- 
You received this message because you are subscribed to 

Re: [git-users] Can't ssh to the host after installing gitosis

2013-06-25 Thread Lee Wong
I've solved it by removing /root/.ssh/authorized_keys folder.  

--  
Lee Wong
王磊
Xidian University
blog.leewongstudio.com
已使用 Sparrow (http://www.sparrowmailapp.com/?sig) 发送


On 2013年6月23日Sunday at 10:26, Lee Wong wrote:

  
 In the process, I issued gitosis-init FILENAME.pub with root and delete 
 /root/repositories. Then i did everything done. But when i ssh to the host 
 today,it reports
  
  
 PTY allocation request failed on channel 0 ERROR:gitosis.app:Configuration 
 does not exist: [Errno 2] No such file or directory: '/root/.gitosis.conf'
  
  
 I wonder what can i do? It's really urgent.Please help!
  
  
 --  
 You received this message because you are subscribed to a topic in the Google 
 Groups Git for human beings group.
 To unsubscribe from this topic, visit 
 https://groups.google.com/d/topic/git-users/V5U-0mC2c6c/unsubscribe.
 To unsubscribe from this group and all its topics, send an email to 
 git-users+unsubscr...@googlegroups.com.
 For more options, visit https://groups.google.com/groups/opt_out.
   
   

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.




Re: [git-users] Merging hotfix without merging all files.

2013-06-25 Thread Shouvik
On Thu, Jun 20, 2013 at 7:52 PM, Dale R. Worley wor...@alum.mit.edu wrote:

  From: Konstantin Khomoutov flatw...@users.sourceforge.net
 
   Then after fixing the bug in 3 files (for eg index.php, register.php
   and login.php), i merge it in the master branch
  
   *git checkout master
**git merge bugfix*
  
   The above code will merge all the 3 files i made changes, but is
   there anyway that i can force GIT to merge only 2 files, say
   login.php and register.php only?
 
  Yes, pass the --no-commit option to `git merge` and it won't
  automatically record a merge commit but will rather leave the changes
  staged in the index.  Then you'll be able to unstage the changes made
  to index.php by running
 
  $ git reset index.php
 
  After that, commit as usually.

 My understanding is that one could also use this sequence:

  git checkout master
  git merge --no-commit bugfix

 and then selectively commit the changes one wanted to commit:

  git commit login.php register.php

 Am I correct?

 This would be somewhat easier to use if one wanted to then commit the
 remaining changes, as they would remain in the index for

  git commit

 Dale

 --
 You received this message because you are subscribed to a topic in the
 Google Groups Git for human beings group.
 To unsubscribe from this topic, visit
 https://groups.google.com/d/topic/git-users/kaQcM4I9ik0/unsubscribe.
 To unsubscribe from this group and all its topics, send an email to
 git-users+unsubscr...@googlegroups.com.
 For more options, visit https://groups.google.com/groups/opt_out.




Ok so please confirm if the following steps are okay (assuming that
currently I am in *bugfix* branch)


git commit -m major bug fixing register.php login.php index.php
git checkout master
git merge --no-commit bugfix
git reset index.php
git push origin master


Thanks

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.