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 t
On 2015-02-22, at 9:04 PM, Nicolas Dermine wrote:
> Hi Michael,
>
> On Mon, Feb 23, 2015 at 2:17 AM, Michael wrote:
>> So a quick question: How do I undo/abort a merge?
>>
>> I am learning, and experimenting. I was experimenting with "git merge",
>&g
> 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
keybou
On 2015-02-23, at 12:40 AM, Magnus Therning wrote:
> On Sun, Feb 22, 2015 at 11:43:07PM -0800, Michael wrote:
>>> git-annex is mainly for large files with versioning. Therefore, it is not
>>> suitable for my situation.
>>
>> Annex?
>
> Yes,
> 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 has
How would someone check out a copy of branch "limonite-placer" from
https://gist.github.com/5e037df5b5c9209885d5.git
Is the only way to do a full clone of the entire history locally, and then
check out the files you want?
Equally, if two local users wanted to work on the same project, how do th
On 2015-02-24, at 10:40 PM, Gergely Polonkai 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 instead of
> master
On 2015-02-22, at 9:04 PM, Nicolas Dermine wrote:
> Hi Michael,
>
> On Mon, Feb 23, 2015 at 2:17 AM, Michael wrote:
>> So a quick question: How do I undo/abort a merge?
>>
>> I am learning, and experimenting. I was experimenting with "git merge",
>&g
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 expla
On 2015-02-28, at 1:54 AM, Nicolas Dermine 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.
--
You received this messa
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 on
On 2015-05-09, at 2:59 PM, Michael 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 causi
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 merg
On 2015-05-09, at 11:03 PM, Michael 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 he
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++
> when you are finished, you will have several commits, so you may want to
> squash them with git rebase -i
>
> Also, be aware that stash puts every modified file away, but not untracked
> files (use -u for that), so if you have modified files other than that
> config, you
Thank you!
On 2015-05-10, at 5:49 PM, Dale R. Worley wrote:
> Michael 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 w
, and the config file got 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
keyb
On 2015-05-12, at 7:46 PM, Dale R. Worley wrote:
> Michael writes:
>> keybounceMBP:config michael$ git commit -m "First test"
>> [animalAging 0653a0b] First test
>> 1 file changed, 140 insertions(+)
>> create mode 100644 HarderWildlife.cfg
>> ke
>
> 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
On 2015-05-13, at 7:54 AM, Roman Neuhauser 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 tip,
>>
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 debuggi
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 Integratio
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.
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 difference
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
On 2015-09-05, at 5:27 PM, Michael 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 test branch)
Even stranger: I
How do I push a single tag to the remote (origin)?
The branch itself is pushed.
There is a tag ("ReleaseAlpha2") that I want to push.
keybounceMBP:Finite-Fluids michael$ git push ReleaseAlpha2
warning: push.default is unset; its implicit value has changed in
Git 2.0 from 'match
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 to the Google Groups "Git
f
>
> 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 sub
On 2015-09-11, at 12:43 AM, Philip Oakley wrote:
> From: "Philip Oakley"
>> From: "Michael"
>>>> I don't understand this last statement. Perhaps a graph showing the
>>>> arrangement may help de-confuse which are 'off of&#x
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 b
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,
What is the best way to clean up a dead commit?
I have used git reset to rewind the branches.
I know that the commit in question is "dead".
I know that it will eventually get cleaned up automatically.
How can I speed that up, and manually clean it up?
---
Entertaining minecraft videos
http://You
ading the git-gc 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 wrote:
> Hi Michael,
>
> They are only locally
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 debugging
another serious bug got introduced.
Here's the minor fix:
keybounceMBP:realisticfluids michael$ git diff stash^ stash | cat
diff --git a/src/main/java/com/mcfht/realisticfluids/FluidData.java
b/src/main/java/com/mcfht/realisticfluids/FluidData.java
index 514e857..a6c4ada 100644
--- a/src
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
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'.
no
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 hav
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
>
>
>
>
>
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 being
> run to serve a push to a
On Wednesday, April 20, 2016 at 11:16:46 AM UTC-4, Santos Pbt wrote:
Inappropriate.
> Hi,
>
>
>
>
>
> Hope you are doing great..!!
>
>
>
>
>
> We have urgent requirement for Github/
> Jira Admin – Location : Weehawken New
> Jersey
>
>
>
>
>
> If you are comfortable with below r
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. Compared to other VCS tools, t
On 2016-05-20, at 11:16 AM, Sharan Basappa wrote:
> Folks,
>
> Git mentions that state of the file as untracked, unmodified, modified and
> staged.
>
> As I understand untracked files are not yet in the respository.
> unmodified and modified is understood but what action results in a file bei
o 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 in this filesystem.)
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 modify b,c
> 5) I add b,c
> 6
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 do), with index being more
>> commonly used
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 https://github.com/videolan/vlc.git
> 412dd75428226d10044e80e
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 realize that I need to make some
So I was making a bunch of fixes and cleanups on a project. Now, applying some
edits and not others isn't hard -- git gui does that nicely. But then there is
testing.
So, I had a "great" idea. From hotfix/Refactor_water_flow, I did this:
keybounceMBP:Finite-Fluids michael$ git c
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 thoug
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), do
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 logical steps.
>
> It costs
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
What's a good way to undo a merge?
In my case: I did
git checkout -m develop
and what I had left over (that did not belong on the branch I was working on)
turned out to be a mess.
So, I tried going back
git checkout -m bugfix/rain-speed-debug
But got an error that I needed to finish my merge
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
http:/
time to get everything cleaned up, and my history is a bit messy at
that point, but it got all done.)
>
> J.
>
> Le mercredi 27 juillet 2016 02:22:41 UTC+2, Michael Gersten a écrit :
> What's a good way to undo a merge?
>
> In my case: I did
> git checkout -m develop
&g
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 statu
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 for
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 in git)?
For me
On 2016-08-02, at 4:25 AM, Konstantin Khomoutov
wrote:
> On Tue, 26 Jul 2016 18:25:19 -0700
> Michael wrote:
>
>> 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?
&
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 wa
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 simple CRC, someone tried
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 Goo
On 2016-08-09, at 9:53 AM, Konstantin Khomoutov
wrote:
> On Mon, 8 Aug 2016 21:27:43 -0700
> Michael wrote:
>
>> Can someone explain stacked git?
>>
>> It was referenced in "Git from the bottom up", but I've never used
>> Quilt, and neit
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 old-draft.tex`.
>
On 2016-08-12, at 10:54 AM, Konstantin Khomoutov
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`
-bash: log: command not found
error: wron
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 you are subscribed to the Google
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 by file basis?
>>>
>>> I think you want
>>>
>>> $ gi
On 2016-08-16, at 5:53 AM, Konstantin Khomoutov
wrote:
> On Mon, 15 Aug 2016 12:16:46 -0700
> Michael wrote:
>
> [...]
>>>> Also: Why "ours" and "theirs"? Which one is which? I'm one person
>>>> with multiple branches.
>>>
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 even today:
> What is im
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 --recur
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 the accidental confusion
On 2016-08-27, at 2:48 PM, Philip Oakley 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 the mapping between remo
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 unsubscribe from this grou
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
Cl
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 you can set look at :
>
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 --ve
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 videos
http://YouTube.com
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 patches, but
> others
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 you Konstantin and Gergely!
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 branc
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 multiple
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 wrote:
> Awesome Post.
>
Lets say you have a system where you have an unmodified upstream source, and a
set of patches to get that upstream source to run on your system.
As I understand it, there are two ways to deal with this in Git:
1. One branch is the upstream's release. This may be a full clone of the
upstream git
What tool/command/whatever generates those nice, horizontally laid out images
of commit history over time?
---
Entertaining minecraft videos
http://YouTube.com/keybounce
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe fro
On 2016-10-23, at 4:34 PM, Philip Oakley wrote:
>
> - Original Message - From: "Michael"
> Lets say you have a system where you have an unmodified upstream source, and
> a set of patches to get that upstream source to run on your system.
>
> As I understa
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 want to just reset my local repo
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 internal data structure is a tree
On 2016-11-12, at 11:51 PM, Rafa wrote:
> Someone could explain to me how exactly the git commit works and if it uses
> threads to perform?
It probably does not use threads.
Read this:
https://jwiegley.github.io/git-from-the-bottom-up/1-Repository/4-how-trees-are-made.html
to get an idea of
On 2016-11-22, at 6:01 AM, Dennis Kaarsemaker wrote:
> On Tue, 2016-11-22 at 02:58 -0800, Vivek Vivek wrote:
>> Hello GIT experts,
>
> git is not an acronym, no need to capitalize :)
Grand Information Theory?
Glorious Information Technology?
Global Intellectual Thinking?
Ground Into Trouble?
What is TFS?
On 2016-12-15, at 2:03 AM, Magnus Therning wrote:
>
> essam Ganadily writes:
>
>> As far as i can tell, there is no way i can create remote git repository
>> from command line (git.exe in windows). if i am not mistaken shall you tell
>> me why such limitation exist given that gi
On 2016-12-22, at 12:33 AM, Oded Badt wrote:
> Update: A coworker found a workaround to my original question:
>
> [filter "remove_outputs"]
> clean = /bin/sh -c '$PWD/remove_outputs'
> smudge = cat
>
> Works as long as remove_outputs is in the repo root and thats where you run
>
What is the best way to convert a CRLF repository to LF? Assume that everything
in it is a text file, it had been developed on a windows system and is now
going to support windows and unix, and we'll be switching to automatic linefeed
translation.
(The last time we tried this, it listed every f
On 2017-01-04, at 4:29 PM, AD S wrote:
> Hi Philip,
>
> I am using my company's propriety software that automatically runs a few git
> commands one after the other (it's meant to be more thorougher). The process
> it runs when pushing to remote repo (testing branch) is:
>
> git push ${projec
So, the question of "which form to use on windows" depends if you are using git
for windows with the normal windows shell, or if you are using git for windows
with cygwin and the bash shell?
On 2017-01-08, at 9:06 AM, Konstantin Khomoutov
wrote:
> On Sun, 8 Jan 2017 07:42:45 -0800 (PST)
> Fe
>On Wed, 2017-01-11 at 22:14 -0800, AD S wrote:
>> Sometimes when I push to the remote repo, only some of the files
>> appear. However, if I push to Github I can see them all appearing
>> fine.
>
> This is an interesting comment. Does this mean you're using multiple
> remotes in your work? That
(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 let
(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 let
1 - 100 of 368 matches
Mail list logo
