How do I see “merge events” in history?

2017-05-23 Thread Stefan Monov
I use the GitHub web interface and the git cli. Answers for either or both are appreciated. Sometimes, when I merge a branch into another branch, I see a commit with a message like "Merge branch 'master' into other_branch" in the GitHub history. But not always. So how do I see all "merge events",

Re: Making it possible to do “git push origin” instead of “git push origin ”, without having to one-time prepare each branch for it

2016-12-27 Thread Stefan Monov
Thanks guys!

Re: Making it possible to do “git push origin” instead of “git push origin ”, without having to one-time prepare each branch for it

2016-12-22 Thread Stefan Monov
Also, if I do the "setup" step (`push -u`) for a branch that doesn't exist yet (neither on my PC nor on the server), does that remove the need to do `git checkout -b ` first? On Thu, Dec 22, 2016 at 11:14 PM, Stefan Monov wrote: > Hi. > > I'd like to use just: &g

Making it possible to do “git push origin” instead of “git push origin ”, without having to one-time prepare each branch for it

2016-12-22 Thread Stefan Monov
Hi. I'd like to use just: git push or at most: git push origin rather than having to first check which is the active branch with `git branch --list`, then type: git push origin At [1] and [2] I've seen that if I do this once: git push -u origin then from then on I can use

Re: `git stash apply` deleted a random dir from my working copy

2016-11-03 Thread Stefan Monov
dir got deleted in the first place though. On Thu, Nov 3, 2016 at 7:01 PM, Stefan Monov wrote: > Actually, I just tried restoring my dir with `git pull origin > clipping`, but that didn't restore it. So, besides the question "why > did it get deleted", I'd like to ask &qu

Re: `git stash apply` deleted a random dir from my working copy

2016-11-03 Thread Stefan Monov
Actually, I just tried restoring my dir with `git pull origin clipping`, but that didn't restore it. So, besides the question "why did it get deleted", I'd like to ask "how do I restore it?", as well. On Thu, Nov 3, 2016 at 6:06 PM, Stefan Monov wrote: > Hi. >

`git stash apply` deleted a random dir from my working copy

2016-11-03 Thread Stefan Monov
data back from the repo. But I'd still like to know why this problem happened. TIA, Stefan Monov Saved working directory and index state WIP on clipping: cfeac4b - applying the solution from http://stackoverflow.com/questions/40385482/why-cant-i-use-opengl-es-3-0-in-qt HEAD is now at cf

Re: Is the entire working copy “at one branch”?

2016-10-31 Thread Stefan Monov
Thanks Alexei! On Sat, Oct 29, 2016 at 12:47 PM, Alexei Lozovsky wrote: > Hi Stefan, > > Generally with git, your entire working copy will have the same > revision (set to current branch, aka HEAD). The idea behind this > is that your working copy of a repository should always be in > consistent

Is the entire working copy “at one branch”?

2016-10-28 Thread Stefan Monov
r a working copy with the dirs `foo` and `bar` in it. In SVN one can `update` foo to an earlier version, but keep `bar` at `HEAD`. Is it possible in an analogical git working copy to checkout one branch in dir `foo` without changing the branch checked out in `bar`? If not, why not? TIA, Stefan Monov

Git crash course for SVN users - which of the 2?

2016-10-28 Thread Stefan Monov
I googled and found these two official-looking results: https://git.wiki.kernel.org/index.php/GitSvnCrashCourse https://git-scm.com/course/svn.html Which of the two should I use? And I'd ask for the other one to be deleted so there's no such further confusion for other user.

Re: Git context menu in Windows Exporer has a “git bash” option but it doesn't work

2016-10-21 Thread Stefan Monov
window. Thanks for (indirectly) helping me resolve the issue. :) On Fri, Oct 21, 2016 at 3:40 PM, Johannes Schindelin wrote: > Hi Stefan, > > On Fri, 21 Oct 2016, Stefan Monov wrote: > >> The default git distribution for windows > > Are you referring to Git for Windows? Which

Git context menu in Windows Exporer has a “git bash” option but it doesn't work

2016-10-21 Thread Stefan Monov
git bash window opens and immediately closes, giving me no chance to even see what it says inside it. Any fix? Note: Opening Git Bash from the Windows Start Menu works fine, but if I open it that way, then I need to manually cd to the needed dir. TIA, Stefan Monov