Posted
by GiH
on Stack Overflow
See other posts from Stack Overflow
or by GiH
Published on 2010-03-11T17:33:18Z
Indexed on
2010/03/11
18:19 UTC
Read the original article
Hit count: 252
I'm new to git and I'm trying to understand the difference between a squash and a rebase. As I understand it you perform a squash when doing a rebase.
© Stack Overflow or respective owner
as seen on Stack Overflow
- Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server.
My cent 6.3 vm gets a 401 error
git clone https://git.acme.com/git/torque-setup
"error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs
As a work…
>>> More
as seen on Ask Ubuntu
- Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop:
http://git-scm.com/download/linux
When I do:
$ sudo apt-get install git-core
This is what my terinal shows:
Reading package lists... Done Building dependency tree Reading
state information... Done The following packages…
>>> More
as seen on Server Fault
- Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn).
svn support works well, but I have some trouble with git.
Actual configuration:
CentOS 5
Apache 2.2.8
Git 1.7.4.1
The /etc/httpd/conf/httpd.conf content:
ServerTokens OS
ServerRoot "/etc/httpd"
PidFile run/httpd…
>>> More
as seen on Server Fault
- Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S).
I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference).
I have searched the whole afternoon and I think I'm stuck.
I have think I have understood that nginx needs fcgiwrap…
>>> More
as seen on Server Fault
- Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
Hey guys,
In Git I can do this:
1. Start working on new feature:
$ git co -b newfeature-123 # (a local feature development branch)
do a few commits (M, N, O)
master A---B---C
\
newfeature-123 M---N---O
2. Pull new changes from upstream master:
$ git pull
(master updated with…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
I just tried to rebase a very old branch with a minor modification onto my master.
There was a problem with merging just one of the three files involved, so I did an unthinking --skip, thinking that it would just skip that file, but as it happened, it seems to have skipped all my changes, and rolled…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
I have a local branch work, where I created two new files a.py, b.py and committed them.
Then, instead of doing "git rebase origin/master", I accidently typed "git rebase origin master", and now the commit I did is gone and the files are gone. Does anyone know how I can recover my files?
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
Could somebody please explain to me why people warn about commit conflicts occuring from a rebase operation?
I tried reading about this by searching google but had some trouble understanding. If it matters, I am using ClearCase revision control.
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
I know of some people who use git pull --rebase by default and others who insist never to use it. I believe I understand the difference between merging and rebasing, but I'm trying to put this in the context of git pull. Is it just about not wanting to see lots of merge commit messages? Or are…
>>> More
