|
May
8 |
|
awarded | Popular Question |
|
Apr
29 |
|
comment |
gnome-terminal. New tab opening @PaoloBonzini, indeed I agree, it's a feature. Unfortunately the behaviour seems to have changed with Gnome 3.8. How do I get back the old behaviour? |
|
Apr
23 |
|
awarded | Scholar |
|
Apr
23 |
|
accepted | git-http-backend, ro for all, write requiring password? (with lighttpd) |
|
Apr
23 |
|
answered | git-http-backend, ro for all, write requiring password? (with lighttpd) |
|
Apr
22 |
|
comment |
What's the best three-way merge tool? @lzap, actually meld was three-way, but it was undocumented and a month or so ago I noticed they've completely removed the 3-way merge: is.gd/prKX5d If you stick with an old enough version you are still in luck though. |
|
Apr
14 |
|
awarded | Tumbleweed |
|
Apr
7 |
|
asked | git-http-backend, ro for all, write requiring password? (with lighttpd) |
|
Apr
4 |
|
comment |
Is there a utility to indent C++ programs I believe Artistic Style can handle reformatting spaces nowadays with the --unpad-paren option.
|
|
Apr
4 |
|
accepted | Haskell doctest and FFI |
|
Mar
28 |
|
comment |
My git mergetool open 4(not 3) windows in vimdiff No one seems to have pointed this out to you: you need four windows to perform a 3-way diff if you also want the merge-result window to show. In other words, you get a diff between BASE, LOCAL and REMOTE (3 windows), and the possibility to edit the resulting merge (the 4th window). |
|
Mar
18 |
|
awarded | Good Question |
|
Mar
18 |
|
comment |
Vim: Ignore Special Path in Search Recent versions of grep has --ignore-dir too, which might be just what you are looking for.
|
|
Mar
14 |
|
awarded | Tumbleweed |
|
Mar
7 |
|
comment |
Git users in an SVN shop, organising our repos @AdamAdamszek I didn't look. I imagine any subgit alternative would also require being installed on the SVN server itself. Getting the administrator of that Windows box to install subgit, or an alternative, is a much larger (political) project than I'd like to take on at the moment. |
|
Mar
7 |
|
comment |
Git users in an SVN shop, organising our repos @JonathanWakely It's when it comes to sharing between git users that we've run into problems. We both make sure to keep a linear history, using rebase frequently, but that hasn't prevented our git-svn repos from having no single hash in common. |
|
Mar
7 |
|
comment |
Git users in an SVN shop, organising our repos Did you perform this scripting yourselves, or is there an OSS project to base it on? |
|
Mar
7 |
|
comment |
Git users in an SVN shop, organising our repos Jonathan, the interesting bit for me would be if you, with this setup, also can share work directly between the git users. |
|
Mar
7 |
|
revised |
Git users in an SVN shop, organising our repos Clarifying that solutions that require admin access to the SVN server are of little use to me. |
|
Mar
7 |
|
comment |
Git users in an SVN shop, organising our repos Yes, indeed, that would fit the bill perfectly. Now I just need to find some way to carry us over until I've cajoled the system admin to install subgit on the SVN server. |
