[git-users] How to see branch history?

A branch is git a reference to a single commit. So the question is: how can I see what commits it pointed to before? Although we can see all ancestors of any commit we need some way to tell past head revisions apart from any developer branches. Even if a commit has only one parent the branch is not

[git-users] Needc explanation of the differences between GIT and SVN

I come from an SVN background, and I have a hard time grasping Git's philosophy. In particular, I'm confused by the following. 1. Imagine I have made some changes in my working dir. If I switch to another branch, the changes*remain*, which is very unusual, from an SVN point o

[git-users] Merge without replacing the outdated data.

Greetings, Ladies and Gentlemen! I have some special task which is definitely out of everyday git practices scope. Please let me know if its possible to accomplish this with some hacks. I have two branches of development of a single product. These two branches diverged long ago. Now its time t

Re: [git-users] Merge without replacing the outdated data.

Konstantin, looks like I am missing something. I got to branch A which I want to 'merge' (preserving the differencies) with branch B. I run git read-tree -m HEAD I get a number of files updated and added in my working folder. Files that were absent in branch A are added, the differenceis are a

[git-users] Bash completion bug

Bash remote branch name completion reports an error if working copy contains a directory with the same name as remote name. Steps: $ git remote origin $ mkdir origin $ git pull origin fatal: Not a git repository: 'origin' The problem is in the __gitdir() function. I've replaced it's complex l

[git-users] Re: Bash completion bug

Just found the fix doesn't work. It should be fixed somewhere deeper in the logic -- 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...@

[git-users] Re: Bash completion bug

Another quick fix that looks working: added __git_refs variant which looks for refs only, not directory structure. Call it for git pull. $ diff -u /usr/share/bash-completion/completions/git ~/tmp/git --- /usr/share/bash-completion/completions/git 2015-10-22 01:54: 32.0 +0300 +++ /home/d

[git-users] Line up merge tree

Hello. I had a pack of branches. And I forget to rebase them before merging with master. Here what I have now: Is it possible to convert this complex net into strict line of c

[git-users] git -c option doesn't override options from configs

Hi, git man page says parameters passed with an option -c will override values from configuration files. I found that sometimes this is not the case. For example, I want to override 'url..insteadOf' option from my configuration file, to do that I run git with an option git -c url..insteadOf= ls-

[git-users] git log (HEAD->master, origin/master) vs (HEAD -> master)

Hello, There are two people working on the same project. While doing the 'git log', one see it with (HEAD->master, *origin/master*) and another with just (HEAD -> master) without *origin/master*. What does it mean? Actually one cannot see the commits of another. Thank you! -