Posted
by inger
on Stack Overflow
See other posts from Stack Overflow
or by inger
Published on 2010-06-17T21:08:52Z
Indexed on
2010/06/17
21:13 UTC
Read the original article
Hit count: 137
I just need a plain list of conflicted files.
Is there anything simpler than:
git ls-files -u | cut -f 2 | sort | uniq
or
git ls-files -u | awk '{print $4}' | sort | uniq
?
© 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'
I am receiving the following foreach error on my PHP file and I have no idea how to fix it. Does anyone have any ideas?
When I load the page I get this:
Warning: Invalid argument supplied for foreach() in /home/mysite/public_html/merge/class/global_functions.php on line 61
Warning: Invalid argument…
>>> More
as seen on Geeks with Blogs
- Search for 'Geeks with Blogs'
Technorati Tags: Team Foundation Server 2010,TFS SDK,TFS API,TFS Merge Programmatically,TFS Work Items Programmatically,TFS Administration Console,ALM
The information available in the Merge window in Team Foundation Server 2010 is very important in the decision making during the merging process…
>>> More
as seen on Super User
- Search for 'Super User'
Is there a simple way to mail merge with Word 2007 and add an attachment? I've searched google, and all results point to pasting in VB code.
I want to a small team of novice users to be able to mail merge e-mails and add attachments.
Does anyone know a simple way of doing this without code?
>>> More
as seen on SQL Blog
- Search for 'SQL Blog'
The query optimizer does not always choose an optimal strategy when joining partitioned tables. This post looks at an example, showing how a manual rewrite of the query can almost double performance, while reducing the memory grant to almost nothing. Test Data The two tables in this example use…
>>> More
as seen on Dot net Slackers
- Search for 'Dot net Slackers'
Its a good idea not to do too much work without checking something into source control. By too much work I mean typically on the order of a couple of hours at most, and certainly its a good practice to check in anything you have before you leave the office for the day. But what if your…
>>> More
