Stack Overflow
Stack Overflow

Questions tagged [dvcs]

DVCS stands for Distributed Version Control System. Use this tag for questions about DVCSes in general. If your question is about git, or another DVCS that has its own tag already, then use that tag instead of this one.

Distributed revision control system (DRCS), distributed version control or decentralized version control system (DVCS) keeps track of software revisions and allows many developers to work on a given project without necessarily being connected to a common network.

Most popular DVCS:

911 questions
2560
votes
16 answers

How do I show the changes which have been staged?

I staged a few changes to be committed. How do I see the diffs of all files which are staged for the next commit? Is there a handy one-liner for this? git status only shows names of files which are staged, but I want to see the actual diffs. The…
Frerich Raabe
  • 90,689
  • 19
  • 115
  • 207
2023
votes
15 answers

Undo working copy modifications of one file in Git

After the last commit, I modified a bunch of files in my working copy, but I want to undo the changes to one of those files, as in reset it to the same state as the most recent commit. However, I only want to undo the working copy changes of just…
hasen
  • 161,647
  • 65
  • 194
  • 231
1030
votes
19 answers

How can I stop .gitignore from appearing in the list of untracked files?

I just did a git init on the root of my new project. Then I created a .gitignore file. Now, when I type git status, .gitignore file appears in the list of untracked files. Why is that?
Jacques René Mesrine
  • 46,127
  • 27
  • 66
  • 104
813
votes
75 answers

Pushing to Git returning Error Code 403 fatal: HTTP request failed

I was able to clone a copy of this repo over HTTPS authenticated. I've made some commits and want to push back out to the GitHub server. Using Cygwin on Windows 7 x64. C:\cygwin\home\XPherior\Code\lunch_call>git push Password: error: The requested…
Mike
  • 19,267
  • 11
  • 56
  • 72
726
votes
25 answers

What is the Difference Between Mercurial and Git?

I've been using git for some time now on Windows (with msysGit) and I like the idea of distributed source control. Just recently I've been looking at Mercurial (hg) and it looks interesting. However, I can't wrap my head around the differences…
Spoike
  • 119,724
  • 44
  • 140
  • 158
524
votes
9 answers

Git and Mercurial - Compare and Contrast

For a while now I've been using subversion for my personal projects. More and more I keep hearing great things about Git and Mercurial, and DVCS in general. I'd like to give the whole DVCS thing a whirl, but I'm not too familiar with either…
TM.
  • 108,298
  • 33
  • 122
  • 127
325
votes
13 answers

What's the best three-way merge tool?

Subversion, Git, Mercurial and others support three-way merges (combining mine, theirs, and the "base" revision) and support graphical tools to resolve conflicts. What tool do you use? Windows, Mac OS X, Linux, free or commercial, you name…
Dan Fabulich
  • 37,506
  • 41
  • 139
  • 175
254
votes
7 answers

Mercurial — revert back to old version and continue from there

I'm using Mercurial locally for a project (it's the only repo there's no pushing/pulling to/from anywhere else). To date it's got a linear history. However, the current thing I'm working on I've now realized is a terrible approach and I want to go…
Paolo
  • 22,188
  • 6
  • 42
  • 49
213
votes
5 answers

Mercurial: Can I rename a branch?

We now have a "stiging" branch, where "staging" seems to be a far better semantic fit. What's a good strategy for handling this?
KevDog
  • 5,763
  • 9
  • 42
  • 73
211
votes
5 answers

Hg: How to do a rebase like git's rebase

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…
jpswain
  • 14,642
  • 8
  • 58
  • 63
205
votes
11 answers

Git interoperability with a Mercurial Repository

I use GIT on a Mac. Enough said. I have the tools, I have the experience. And I want to continue to use it. No wars here... The problem is always with interoperability. Most people use SVN, which is great for me. Git SVN works out of the box, and is…
Hugo Sereno Ferreira
  • 8,600
  • 7
  • 46
  • 92
179
votes
5 answers

How can I see incoming commits in git?

Possible Duplicate: Using Git how do I find modified files between local and remote How can I see incoming commits in git? Or even better, see what I just git fetch/git pulled? Edit: To clarify the question: someone tells me that, to get some…
Benjamin Pollack
  • 27,594
  • 16
  • 81
  • 105
145
votes
3 answers

Git pull from another repository

I have a repository called Generic, which is a generic application. I have forked it into a repository called Acme, which just builds upon the application stored Generic repository and adds Acme Co branding to it. If I make changes to the core…
Libbux
  • 1,711
  • 2
  • 12
  • 14
144
votes
6 answers

Merging: Hg/Git vs. SVN

I often read that Hg (and Git and...) are better at merging than SVN but I have never seen practical examples of where Hg/Git can merge something where SVN fails (or where SVN needs manual intervention). Could you post a few step-by-step lists of…
stmax
  • 6,506
  • 4
  • 28
  • 45
131
votes
6 answers

Named Branches vs Multiple Repositories

We're currently using subversion on a relatively large codebase. Each release gets its own branch, and fixes are performed against the trunk and migrated into release branches using svnmerge.py I believe the time has come to move on to better source…
James Emerton
  • 4,129
  • 2
  • 25
  • 33
1
2 3
…
60 61