[git-users] updating a fork from master?

, is there a way where I can update my fork from the master with showing me possible conflicts? I.e. in case I already altered a file locally and/or my online fork while somebody else also worked on the same document. Thanks, Michael. -- You received this message because you are subscribed

[git-users] How to promote a Git branch to another repo master

? Thanks... Regards, Michael --

[git-users] How to promote a Git branch to another repo master

? Thanks... Regards, Michael --

[git-users] Re: creating bare, shared repository on NFS mounted NAS storage, from existing git working directory

John, Sounds similar to a scenario I want to consider: promote local Git branch to remote (SSH) bare repository. In other words, your post benefits community. It's helpful. Thank you... Regards, Michael On Friday, December 7, 2012 10:29:29 AM UTC-6, John McKown wrote: Idiot me

[git-users] Looking for C# Git library

reading also for Mercurial (Hg), along these lines. Is there anything comparable for Git that I can pull from NuGet or some other source? Regards, Michael --

[git-users] Linux Ubuntu Git submodule not working

? Any advice? Thank you... Regards, Michael Powell -- 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...@googlegroups.com. For more options

[git-users] How to rearrange commits in a repo

-support-package repo, so once it's set, that's it. I am tasked to review the history and identify a somewhat sane version to tag it with. If necessary may need to inject earlier versions, but hopefully that won't be necessary. Thank you... Regards, Michael Powell -- You received this message

[git-users] Help understanding rebase

I'd like some help understanding rebase. The best explanation/rationale I have found so far is the world conquest scenario: http://stackoverflow.com/a/5251162/2027089 But ... what I don't understand is what sort of rebase commands were actually done in those examples. Can someone please

Re: [git-users] How do I undo a merge?

On 2015-02-28, at 1:54 AM, Nicolas Dermine nicolas.derm...@gmail.com wrote: You can use (with care) `git push --force` in this case. nico Thanks. I'm starting to learn why there is a private and a public repository -- to give you a chance to clean up your mistakes before publishing. --

Re: [git-users] How do I check out a remote git?

On 2015-02-24, at 10:40 PM, Gergely Polonkai gerg...@polonkai.eu wrote: Hello, yes, basically that is the way. There is an option in recent Git called shallow clone, which doesn't clone the whole history, only the last N commits. You can also specify the branch name you want to use

Re: [git-users] How to use git to store large files without keeping track of versions?

git-annex is mainly for large files with versioning. Therefore, it is not suitable for my situation. Annex? keybounceMBP:2aec26bc01189ea4b310 michael$ man git-annex No manual entry for git-annex keybounceMBP:2aec26bc01189ea4b310 michael$ git --version git version 2.2.2 keybounceMBP

[git-users] How do I undo a merge?

So a quick question: How do I undo/abort a merge? I am learning, and experimenting. I was experimenting with git merge, forgot the --no-commit, and discovered the hard way that aborting the editor that comes up without saving does NOT abort the merge. And git merge --abort fails, because the

Re: [git-users] How to use git to store large files without keeping track of versions?

So a common idiom is to put an object into the repository and then make a tag (usually annotated) pointing to it: $ git tag -a my-big-file $(git hash-object -w my-big-file) The `git hash-object -w` command will read the specified file, put it into the repo and print the SHA-1 hash

Re: [git-users] How do I undo a merge?

On 2015-02-22, at 9:04 PM, Nicolas Dermine nicolas.derm...@gmail.com wrote: Hi Michael, On Mon, Feb 23, 2015 at 2:17 AM, Michael keybou...@gmail.com wrote: So a quick question: How do I undo/abort a merge? I am learning, and experimenting. I was experimenting with git merge, forgot

Re: [git-users] How do you switch head location without changing files?

Thank you! On 2015-05-10, at 5:49 PM, Dale R. Worley wor...@alum.mit.edu wrote: Michael keybou...@gmail.com writes: Lets say you've got files set up to commit to one point in the tree, but you're actually in a different location. How do you move where you are / where a commit will go

[git-users] Re: Testing a file with lots of change chunks, one chunk at a time

On 2015-05-09, at 2:59 PM, Michael keybou...@gmail.com wrote: So here's something that I'd like to do, and I'm wondering if Git is the right tool for this. I have a program's config file, that is broken up into a large number of sections. One of them is causing a problem. All of them

[git-users] Testing a file with lots of change chunks, one chunk at a time

So here's something that I'd like to do, and I'm wondering if Git is the right tool for this. I have a program's config file, that is broken up into a large number of sections. One of them is causing a problem. All of them have been modified. The easiest way that I can think of to find which

[git-users] Re: How do you switch head location without changing files?

Last question for tonight Lets say you've got files set up to commit to one point in the tree, but you're actually in a different location. How do you move where you are / where a commit will go, without altering the files? keybounceMBP:Loot++ michael$ git stash Saved working directory

[git-users] How do you switch head location without changing files?

Lets say you've got files set up to commit to one point in the tree, but you're actually in a different location. How do you move where you are / where a commit will go, without altering the files? How did I get here? 714 git checkout 4194 715 git tag -a baseChest -m Branch here for

[git-users] Re: How do you switch head location without changing files?

On 2015-05-09, at 11:03 PM, Michael keybou...@gmail.com wrote: Lets say you've got files set up to commit to one point in the tree, but you're actually in a different location. How do you move where you are / where a commit will go, without altering the files? Alright, what happened here

Re: [git-users] Re: Testing a file with lots of change chunks, one chunk at a time

away, but not untracked files (use -u for that), so if you have modified files other than that config, you should commit them first. Best, Gergely On 10 May 2015 02:18, Michael keybou...@gmail.com wrote: On 2015-05-09, at 2:59 PM, Michael keybou...@gmail.com wrote: So here's

Re: [git-users] Help with git reset, please.

Well, `git reset` is completely documented in its manual page (try running `git help reset`). I did. But ... These modes are selected by a special command line option: --soft, --hard or --mixed, with the latter being the default. The --soft option only repositions the branch's tip,

[git-users] Help with git reset, please.

an update from an updated program while running. keybounceMBP:config michael$ git commit -m First test [animalAging 0653a0b] First test 1 file changed, 140 insertions(+) create mode 100644 HarderWildlife.cfg keybounceMBP:config michael$ gitk --all ^C keybounceMBP:config michael$ git commit

Re: [git-users] Help with git reset, please.

On 2015-05-13, at 7:54 AM, Roman Neuhauser neuhau...@sigpipe.cz wrote: # keybou...@gmail.com / 2015-05-13 07:37:34 -0700: These modes are selected by a special command line option: --soft, --hard or --mixed, with the latter being the default. The --soft option only repositions the branch's

[git-users] "Index file" -- what is it?

So I'm starting to be aware that the "index file" isn't a file, but effectively a full commit that isn't finalized. Can someone point me to a good explanation of what the index actually is, and is not, so I'm not trying to understand it by trial and error? -- You received this message because

Re: [git-users] "Index file" -- what is it?

So, I now know a lot more about git, the staging area, git reset, etc. Thank you. And, I'm starting to understand a big point of confusion for me. keybounceMBP:realisticfluids michael$ git status On branch PrepAlpha3.3 Your branch is up-to-date with 'origin/PrepAlpha3.3'. nothing to commit

[git-users] Merging parts of a commit tree into another

This may seem a little strange. I'd like to merge parts of one commit sequence into another. Off of master, I have a bunch of small sequences of 3-4 commits, generally. Each on their own branch. I have integrationTest, branched off master, that has each of these merged in. From

[git-users] What is the best practice for merging multiple branches at once?

Lets say I have 4 branches off master. I have tested, and found that they are all ready to go. What's the best way to merge them in? Is it: 1. A single merge onto master of all 4 branches at once. 2. One-by-one merging from the commit where they branched off, in order of oldest branch first. 3.

[git-users] Rebase ... I am completely confused

I am trying to understand git rebase. I am completely confused by the manual page. It starts by saying that there has to be a valid upstream or it aborts, yet none of the examples even describes how upstream affects anything. That's my first point of confusion. I don't understand the

Re: [git-users] Re: How do I push a single tag?

On 2015-09-06, at 6:20 PM, Oliver Davies wrote: > Try "git push origin ReleaseAlpha2". You normally have to include the name of > the remote repository as well as the branch, tag, commit hash etc. Thank you. -- You received this message because you are subscribed

Re: [git-users] Rebase ... I am completely confused

On 2015-09-05, at 5:27 PM, Michael <keybou...@gmail.com> wrote: > Ok, first question: Why does > git rebase --onto HEAD RemoveDebugSpam > > not work? It results in no change -- it does not move "RemoveDebugSpam" to > the current HEAD (on a newly checked out

Re: [git-users] Rebase ... I am completely confused

Ok, first question: Why does git rebase --onto HEAD RemoveDebugSpam not work? It results in no change -- it does not move "RemoveDebugSpam" to the current HEAD (on a newly checked out test branch) keybounceMBP:Finite-Fluids michael$ git status On branch RebaseSimpleMerge nothing

[git-users] Undo a merge - how?

So I'd like to know the proper way to undo a merge. Searching on stack overflow gave me lots of different results with different people warning about different things. In my case, I've got a branch Integration test, and a branch WhyDoesItCrashP -- that last one is just tossing some debugging

Re: [git-users] Rebase ... I am completely confused

> > I don't understand this last statement. Perhaps a graph showing the > arrangement may help de-confuse which are 'off of' and which are 'on to'. Sure; how to generate that graph? --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this message because you are

Re: [git-users] Rebase ... I am completely confused

Alright. The original problem: I have a repo forked from someone else's repo. I am taking over maintenance and possible enhancements. As part of this, and following good coding practice, I have made branches for the various things that I have been doing. I have also made updates to master to

[git-users] Looking for a change to a file

I've got a file, with a diff/change, that I thought had already been checked into a previous commit. I want to see if this change exists in any checkin of that file. Is there any way to ask for "all the checked-in versions of file X"? As far as I know, git only knows files by their sha hashes,

Re: [git-users] Forcing cleanup of garbage commit?

c man page); why is it disappearing so quickly? Or, perhaps a better question: How can I hide something that I don't want to see from things like "gitk --all"? On 2015-09-15, at 8:23 PM, Alexandru Pătrănescu <dreal...@gmail.com> wrote: > Hi Michael, > > They are only l

Re: [git-users] Rebase ... I am completely confused

On 2015-09-11, at 12:43 AM, Philip Oakley <philipoak...@iee.org> wrote: > From: "Philip Oakley" <philipoak...@iee.org> >> From: "Michael" <keybou...@gmail.com> >>>> I don't understand this last statement. Perhaps a graph showi

[git-users] Spacing changes and applying patches/diffs

So how do you deal with patches that are mostly wrecked by spacing changes? I've got a couple of files that, in the course of going from point A to point B, had tabs replaced with spaces. There's some minor edits, and a lot of additions, as shown by "git diff -b" The problem? I'm on a

[git-users] Trying to merge a hotfix into master, what am I doing wrong?

I'm trying to merge a hotfix into the master branch. What am I doing wrong? (on master): keybounceMBP:Finite-Fluids michael$ git merge ReleaseAlpha40..HotFixFluidLost merge: ReleaseAlpha40..HotFixFluidLost - not something we can merge What's going on: ReleaseAlpha40 and master have a common

Re: [git-users] How to clone a particular revision?

On 2016-05-26, at 5:41 AM, Konstantin Khomoutov wrote: > > Impossible with `git clone` as it's tailored for the most common case > which is "get everything". > You need a two-step operation: > > git init vlc > cd vlc > git fetch

Re: [git-users] How GIT stores data

On 2016-05-29, at 7:58 AM, Sharan Basappa wrote: > Folks, > > Having started using GIT, one more question ... > > I do some work on a file. Assume the file is version is F.1. I think it is > fairly done and I stage it (git add) but don't commit. > Now later, I

[git-users] Re: Us congress hearing of maan alsaan Money laundry قضية الكونغجرس لغسيل الأموال للمليادير معن الصانع

On Sunday, March 6, 2016 at 6:27:17 PM UTC-5, samir A wrote: Inappropriate. > YouTube videos of > > > > >   > > > > >  U.S. Congress > money laundering hearing > > > > > > > of > > > > > > Saudi Billionaire  " Maan  Al sanea" > > > > >  with bank of America > > > > >

Re: [git-users] Force push related concerns

On 2016-04-13, at 7:34 AM, Konstantin Khomoutov wrote: > > There's actually nothing to be surprised about: Git was explicitly > designed in a way to abstrain itself from managing authentication, > authorization and access controls. Hence, when a Git process is

Re: [git-users] How GIT stores data

On 2016-05-20, at 11:10 AM, Sharan Basappa wrote: > Folks, > > I am pretty much new to Git though I am using it for a couple of projects > (without much understanding as such). > >In Git documents, it is mentioned that Git stores data as a stream of >snapshots.

Re: [git-users] How GIT stores data

this, it's pretty easy to see that if two commits are completely > identical, then the only thing that differs is the commit object itself, > which will have a time stamp and user comment. > > (The middle layer by the way, are low-level tools designed to work with the > files

Re: [git-users] Git life cycle

On 2016-05-23, at 8:53 AM, Dale R. Worley wrote: > "Philip Oakley" writes: >> +1 for the nice explanation. > > Thanks! > >> The Index is also commonly called the *staging area* when viewed from an >> outward facing perspective (i.e. what do users

Re: [git-users] How GIT stores data

On 2016-05-22, at 9:31 AM, Sharan Basappa wrote: > Dear Philip, Others, > > Thanks a lot. I have some follow-up questions. > > I am using a simple scenario to get additional clarity. > > 1) I have 4 files in my branch (a,b,c,d) > 2) I modify a > 3) I add a > 4) I

[git-users] Mergetool / vimdiff: How to select a hunk?

When a merge makes a mess, git offers, from "git mergetool", vimdiff. Is there an easy way to select one of the hunks at each point? (generally, what I'm looking for is usually the right option, corresponding to after the '', and tagged as "REMOTE".) --- Entertaining minecraft videos

[git-users] Fetching from a remote ... what am I doing wrong?

What am I doing wrong here? I'm trying to work with something from a remote. keybounceMBP:Finite-Fluids michael$ git fetch origin Readme-File >From https://github.com/keybounce/Finite-Fluids * branchReadme-File -> FETCH_HEAD keybounceMBP:Finite-Fluids michael$ git status On

Re: [git-users] Re: Marking a branch "closed"?

On 2016-07-20, at 9:22 AM, Matěj Cepl wrote: > but I think the right question to ask is what you expect to do with those > leftovers hanging around? ... or leave them around as notes for latter > development (just left them hanging in the repo; branches and commits are > cheap

[git-users] Moving a change from one branch to another?

How do I move a *change* (instead of a whole file) from one branch to another? keybounceMBP:realisticfluids michael$ git diff stash^1 stash -- RealisticFluids.java diff --git a/src/main/java/com/mcfht/realisticfluids/RealisticFluids.java b/src/main/java/com/mcfht/realisticfluids

Re: [git-users] Mergetool / vimdiff: How to select a hunk?

On 2016-08-02, at 4:25 AM, Konstantin Khomoutov <flatw...@users.sourceforge.net> wrote: > On Tue, 26 Jul 2016 18:25:19 -0700 > Michael <keybou...@gmail.com> wrote: > >> When a merge makes a mess, git offers, from "git mergetool", vimdiff. >> >>

Re: [git-users] Stacked git?

On 2016-08-09, at 9:53 AM, Konstantin Khomoutov <flatw...@users.sourceforge.net> wrote: > On Mon, 8 Aug 2016 21:27:43 -0700 > Michael <keybou...@gmail.com> wrote: > >> Can someone explain stacked git? >> >> It was referenced in "Git from

Re: [git-users] moving files to names that were part of the repository

On 2016-08-12, at 8:42 AM, Pablo Rodríguez wrote: > Dear list, > > I’m writing a book with git as control version system. > > I have been writing over 300 pages in a file named `my-book.tex`. Now I > realize that I should start it from scratch. So I just `git mv > my-book.tex

Re: [git-users] moving files to names that were part of the repository

On 2016-08-12, at 10:54 AM, Konstantin Khomoutov <flatw...@users.sourceforge.net> wrote: > git config --add --global alias.rlog `log -M -C` Ok, can you tell me what I'm doing wrong here? keybounceMBP:Finite-Fluids michael$ git config --add --global alias.rlog `log -M -C` -

Re: [git-users] moving files to names that were part of the repository

On 2016-08-12, at 10:54 AM, Konstantin Khomoutov wrote: > 1. http://www.gelato.unsw.edu.au/archives/git/0504/0598.html Wow, that thread got big really fast... --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this message because

[git-users] Seeing the blobs/files downloaded from a fetch / understanding a pull request

So I'm trying to make sure I'm seeing everything that I got in a fetch. My first attempt to fetch was: keybounceMBP:Finite-Fluids michael$ git fetch https://github.com/Draco18s/Finite-Fluids.git master remote: Counting objects: 12, done. remote: Compressing objects: 100% (4/4), done. remote

[git-users] Marking a branch "closed"?

Lets say I've got a topic branch. I've made a bunch of commits. It's messy. But it's done. As I understand it, best practice is to do a squash commit of the whole thing onto the parent branch (develop or master, depending on workflow). And I can do that. What do I do with the leftover? I

Re: [git-users] Marking a branch "closed"?

On 2016-07-19, at 11:02 PM, Charles Manning wrote: > Squashing makes sense if you have a really ratty bunch of checkins with > work-in-progress checkins etc., but unless it's a trivial topic branch I > would still typically make the final set of commits into a few

[git-users] Best practice for a hot fix?

I'm trying to understand the best way to do a hot fix. I have a develop branch, that has the "work in progress". It also has debugging spam. I have a release branch. It was recently synched with develop, and then commits were added to remove the debug spam. A release was made from it. A bug

[git-users] Stacked git?

Can someone explain stacked git? It was referenced in "Git from the bottom up", but I've never used Quilt, and neither project really explains what it is for/doing. --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this message because you are subscribed to the

Re: [git-users] SHA-1 checksum

On 2016-08-07, at 9:26 AM, Sharan Basappa wrote: > Hi, > > I would like to know why GIT calculates checksum of a file. > Typically, checksum is used for the purpose of integrity. > > An example would really help. An example? Ok. Back when something else was using a

[git-users] git merge -- resolving conflicts?

After doing a "git merge", I wind up with a few conflicts. My files have the three states. I am finding that I almost always want the third state (between === and >>>) to resolve these conflicts. How can I tell merge, AFTER seeing the conflicts, and looking at them, to use the third option

Re: [git-users] git merge -- resolving conflicts?

On 2016-08-15, at 7:16 AM, Konstantin Khomoutov wrote: > On Sat, 13 Aug 2016 18:15:17 -0700 > Michael_google gmail_Gersten wrote: > > [...] After I've done the "git merge" and it has failed, how can I then auto-select on a file

Re: [git-users] More on that "merge branch checkout" problem -- cannot abort/go back?

y #2: The three versions in the conflict file were "nothing" (the old develop that had none of these changes), "what was checked in" (the feature branch), and "everything"; what I wanted was "everything - what was checked in" (which is what git diff r

Re: [git-users] News: Git Virtual File System

On 2017-02-07, at 9:47 AM, Hugh Gleaves wrote: > This is extremely promising: > > https://blogs.msdn.microsoft.com/visualstudioalm/2017/02/03/announcing-gvfs-git-virtual-file-system/ ... I detect a sense of humor: "repos of unusual size!", "For example, the Windows

Re: [git-users] Finding a string somewhere in a repository after a given commit.

On 2017-01-23, at 2:38 AM, Konstantin Khomoutov wrote: > ... > > In particular, refer to: > > * the `git log` manual for the description of the > "-Sstring" command-line option (the mode it enables is called > "pickaxe"; see also "--pickaxe-regex" and

[git-users] Tracking one file's diffs from then to now

What command, or gui tool, will let me check one file's diffs over time? i.e.: Lets say I want to see what happened to one file, only, from commit X to the present. Then, as a GUI tool, being able to look through the list/tree of files, and see all the commits (and their locations in the

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

On 2017-01-27, at 12:57 AM, Philip Oakley wrote: > > It doesn't happen at my work, but one has to ask how / why have we dug the > hole so deep and wide that this gross merge conflict continues to repeat it > self as a regular corporate activity, and then how to get out

Re: [git-users] More on that "merge branch checkout" problem -- cannot abort/go back?

On 2017-01-29, at 11:32 PM, Konstantin Khomoutov <flatw...@users.sourceforge.net> wrote: > On Sun, 29 Jan 2017 11:07:34 -0800 > Michael <keybou...@gmail.com> wrote: > >> So since my attempt to switch branches with the "merge" flag (-m) >> gav

[git-users] More on that "merge branch checkout" problem -- cannot abort/go back?

So since my attempt to switch branches with the "merge" flag (-m) gave me an error, I thought I'd try to go back. keybounceMBP:Finite-Fluids michael$ git merge --abort fatal: There is no merge to abort (MERGE_HEAD missing). keybounceMBP:Finite-Fluids michael$ git status On bran

[git-users] Unexpected conflict after using git gui to check in a few lines

so would overwrite my local changes. Here's the offending block after the merge: keybounceMBP:Finite-Fluids michael$ git checkout -b cleanup develop error: Your local changes to the following files would be overwritten by checkout: src/main/java/com/mcfht/realisticfluids/FluidData.java

Re: [git-users] Newb question: can some one explain to me why, when pushing Sass files, only the compiled .css file gets flagged as a merge error and not the .scss files?

So those crazy cascading style sheets that are a to edit with Stylish are actually compiled from something else that is human read/edit-able? That makes a lot of sense, actually. I thought they were just spat out by some program that did layout. On 2017-01-25, at 3:59 AM, Nelson Efrain

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

> Have you looked at git-imerge? Imerge looks like a really nice tool. How stable/sufficient is it? Why is it not part of the normal git distribution? I noticed that it was still getting dev work this month, and in the last two years a bunch of people forked copies of it, and made their own

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

On 2017-01-26, at 1:12 PM, Philip Oakley wrote: > > Is the project well modularised with no file >100 lines (excepting, maybe, > well developed libraries that never change), 100 lines per file?? You're joking, right? That's one of those "in theory" things, right?

Re: [git-users] Finding a string somewhere in a repository after a given commit.

>... > > git log -SisAir --branches ^offending_commit > > should do the trick. > > It says «find all commits reachable from all branches but > excluding the commits also reachable from offending_commit, whose > changesets have a string containing "isAir" added or deleted». > ... WOW. Ok, up

[git-users] "Medium" git: Worktrees, submodules, subtrees

(I hope this isn't considered "advanced" git.) So I just recently found out about worktrees, that let you have two different working trees from the same repository. (NB: Originally, I thought I had learned that git only supported one work tree per repository, but had a special "hardlink" to

[git-users] "Medium" git: Worktrees, submodules, subtrees

(I hope this isn't considered "advanced" git.) So I just recently found out about worktrees, that let you have two different working trees from the same repository. (NB: Originally, I thought I had learned that git only supported one work tree per repository, but had a special "hardlink" to

Re: [git-users] "Medium" git: Worktrees, submodules, subtrees

On 2017-01-16, at 10:25 AM, Philip Oakley <philipoak...@iee.org> wrote: > Hi Michael, > > You are right about the historical perspective. > > However the `Worktrees` is a new feature. > > So yes, you can now have the different branches checked out in differemt >

Re: [git-users] Working with a badly rooted project

On 2017-01-19, at 1:39 PM, Philip Oakley <philipoak...@iee.org> wrote: > Michael, > > There should be no problem.. > > First you / Git can host multiple independent branches / lines of development > -- see 'orphan' branches. > > Second, You say one was fork

[git-users] Two types of .gitignore cases/files?

On the question of "Should .gitignore be in git": Today, I had to try to work with someone else's repository, and merge it into my stuff. And, in the process, I realized that there are two types of files I don't want git to pay attention to. One is output files -- things that are generated

Re: [git-users] Two types of .gitignore cases/files?

Thank you. On 2017-01-19, at 10:49 PM, Konstantin Khomoutov <flatw...@users.sourceforge.net> wrote: > On Thu, 19 Jan 2017 12:36:13 -0800 > Michael <keybou...@gmail.com> wrote: > > [...] >> Does it make sense to let git have two different gitignore files,

Re: [git-users] git merge -- resolving conflicts?

On 2016-08-16, at 5:53 AM, Konstantin Khomoutov <flatw...@users.sourceforge.net> wrote: > On Mon, 15 Aug 2016 12:16:46 -0700 > Michael <keybou...@gmail.com> wrote: > > [...] >>>> Also: Why "ours" and "theirs"? Which one is which? I'm one

Re: [git-users] gitlab CE vs gitlab EE vs bitbucket (on-prem) or something else

On 2016-08-29, at 4:09 AM, Philip Oakley wrote: > ... > So I have junio/master and dscho-git/master, along with my/master (what I > last had on github), so that's three 'master' branches belonging to remotes, > and master (my truly local one). As a contributor, I sign my

Re: [git-users] How to remove commit from branch

On 2016-09-05, at 3:06 AM, Philip Oakley wrote: > Remember, new branches cost nothing! (Ok, so it's a 40 byte file, but that's > still nothing) I think that 40 byte file costs a full 4K allocation block, no? (I know, file system dependent). --- Entertaining minecraft

[git-users] Help needed, doing a clone --depth

I am trying to check out the current rtmpdump, so I can compile the head (the 2.4 release is over a year old and does not work properly with youtube-dl). Here's what happened: keybounceMBP:git michael$ git clone --verbose --depth 1 --shallow-submodules git://git.ffmpeg.org/rtmpdump Cloning

Re: [git-users] Help needed, doing a clone --depth

On 2016-09-04, at 3:43 PM, Philip Oakley wrote: > Do you need it to be depth 1 with shallow submodules? I only want the current head, for compiling. I don't need any of the history. I won't be contributing anything. > > For a whole load of extra environment variables

Re: [git-users] Help needed, doing a clone --depth

Ok, with debugging info. Can anyone tell me what I'm doing wrong / what will fix this? keybounceMBP:git michael$ GIT_TRACE=2 GIT_CURL_VERBOSE=2 GIT_TRACE_PERFORMANCE=2 GIT_TRACE_PACK_ACCESS=2 GIT_TRACE_PACKET=2 GIT_TRACE_PACKFILE=2 GIT_TRACE_SETUP=2 GIT_TRACE_SHALLOW=2 git clone --verbose

Re: [git-users] gitlab CE vs gitlab EE vs bitbucket (on-prem) or something else

On 2016-08-29, at 4:09 AM, Philip Oakley wrote: > ... > > Hope that helps > > Philip Needs digesting ... will try to see if I understand this tomorrow ... -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To

[git-users] Help needed with rebase

So I really don't understand the command line for rebase. What I have: My last two commits on master should have either been on develop, or on a branch off develop. >From my last commit on develop (666e9), I did a version number bump (15003), a >merge into master (95231) -- those two on a

Re: [git-users] Re: non-committed change in a test branch is polluting my master branch

Having gone through the same issue myself multiple times before figuring out what was going on, perhaps this should be highlighted in a "Beginner's guide to common mistakes and how to avoid them" doc for git? On 2016-09-13, at 11:10 AM, Pierre Dutronc wrote: > Thank

Re: [git-users] git worktree fails only for master branch

Git worktree? ... git worktree?!?!! Da fuu ... I've made multiple repositories with hard-linked files, because up until now I thought that a single repository could only handle one working directory tree / one checkout at a time. % git help worktree: A git repository can support

Re: [git-users] gitlab CE vs gitlab EE vs bitbucket (on-prem) or something else

On 2016-08-27, at 6:18 AM, Philip Oakley wrote: > You said "submits a pull request from their master to your master -- which is > as close to a "no-no" as I can imagine, I want their stuff to come in on a > branch." > > - I think in this case we fall into the trap of

Re: [git-users] gitlab CE vs gitlab EE vs bitbucket (on-prem) or something else

On 2016-08-27, at 2:48 PM, Philip Oakley <philipoak...@iee.org> wrote: > Hi Michael, > > There are probably three things to look at here, one is how to generate a > 'refspec' (see `git help glossary` : A "refspec" is used by fetch and push to > describe

Re: [git-users] gitlab CE vs gitlab EE vs bitbucket (on-prem) or something else

On 2016-08-25, at 2:44 PM, Philip Oakley wrote: > Hi, > > I think you should review points 1 and 2 because they try to re-inforce a > centralised control system. And then pass off the responsibility to a machine. Actually, I think that those points are still relevant

[git-users] Getting a copy of a repository for local compiling

So, I'm realizing that there's some basic stuff I just don't know. I want to check out a copy of the current OBS studio. I don't want to contribute, I just want to compile the latest dev version (has native support for Jack audio routing) OBS's "how to install" mentions this: git clone

Re: [git-users] Struggling with cleanly "resetting" a local repo

On 2016-10-25, at 2:11 PM, David Karr wrote: > When I first cloned a remote repo, it had several subdirectories, and I had > Eclipse create projects automatically. > > Since that time, all but one of those subdirectories have been removed from > master. > > I

Re: [git-users] Why are HEAD and Index described as trees in the standard git documentation?

On 2016-11-07, at 8:58 AM, David Karr wrote: > This may be a meaningless pedantic argument, but I noticed that the standard > git documentation talks about "The Three Trees", being "HEAD", "Index", and > "Working Directory". > > I'm aware of the fact that the

Re: [git-users] Using Git as a NoSQL database

So reading that, by the time you are done, it looks like you have redone everything that git add/commit normally do. What do you gain by trying to script the plumbing commands directly, rather than using the existing porcelain? On 2016-10-14, at 9:40 AM, Sidney Souza

  1   2   3   4   >