[git-users] Re: git help about git merge to a specific dir and keep the commit log

I think this is similar to what I gave to a post a couple of days ago. You might try the following on your local machine. I will show the commands that I would enter in a Linux BASH shell. I don't do Windows or MacOSX, but you seem to be on Ubuntu.. First, I would clone the B repository into a

[git-users] Re: git help about git merge to a specific dir and keep the commit log

possible mini bug, instead of: git mv * kvm use git mv \* kvm The \ in front of the * tells git to expand the file names instead of having the shell do it. My mistake. On Monday, December 10, 2012 2:35:58 AM UTC-6, lei yang wrote: > > Hi experts, > > I have two tree A and B, > A: git://gith

[git-users] Re: ls it possible to change the commit info

I've just been reading up on git filter-branch --msg-filter which seems to be a way to address this. But I don't have enough aspirin to make it through the explanation (it makes my head hurt) I wish there was a simple way to just use the user's $EDITOR to clean this up. I have a feeling that o

[git-users] securing data in a non-local repository

I haven't seen anything like this in anything I've read so far. And I know that git is all about freely sharing. But is there some way to have git keep the repository files encrypted. I know that the files in the .git subdirectory are compressed. It seems to me that it should be relatively simp

[git-users] Re: securing data in a non-local repository

for the feedback. On Tuesday, December 11, 2012 1:44:36 PM UTC-6, John McKown wrote: > > I haven't seen anything like this in anything I've read so far. And I know > that git is all about freely sharing. But is there some way to have git > keep the repository files encryp

[git-users] interesting? observation about "git mv" propagation

This may not be a shock to most, but it was a real surprise to me. I have two machines. One at work. One at home. I am using git to keep a project in sync between the two. I have a working directory on both machines. On my home machine, I have a separate "repository" which is on my home machine.

[git-users] Re: interesting? observation about "git mv" propagation

Then all 55 were uncompressed/restored from the repository (on the home machine). And these 55 files total up to 13 gig. Each is about 2-3 meg, except for one which is 1.4 gig. Home machine is a Core i7 running 2.66Ghz. On Thursday, December 13, 2012 9:10:09 AM UTC-6, John McKown wrote: > >

[git-users] Re: Interaction between checkin/checkout attributes : can I reorder filter, ident, text ?

I am not an expert. In blunt fact, I'm rather new with git. But I looked at the documentation you mentioned here: http://www.kernel.org/pub/software/scm/git/docs/gitattributes.html >From my reading, the only processing which you can modify is the "filter" one. The "ident" does one only one "hard

Re: [git-users] Is it possible cp some file from one branch to another without switch branch

What about something like the following (on Linux) git checkout -b newbranch git ls-files | fgrep -v 'file.to.keep' | while read i;do git rm $i;done # newbranch now only contains "file.to.keep" git checkout B git merge newbranch git -d newbranch I'm not too sure about this. I'm still too new at g

[git-users] Re: can I use the Git Logo in commercials ?

read here: http://git-scm.com/downloads/logos Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License . This license lets others distribute, remix, tweak, and build upon your w

[git-users] Re: Help! Git pull deleted files.

Warning: I'm a newbie and you may want to wait for one of the true experts to chime in. But, in the past, I've had good luck with a very simple command: git reset --hard HEAD^ to revert everything back to the previous commit. If you haven't done a commit since "messing up", you might as well j

[git-users] Re: Installing Dependent Libraries for Git

I don't know AIX, but remember: "Google is your friends". I did a search and found some sites which might be of some help. http://icancompute.ca/aix/config/software/install-git-aix/ Some of the tools you need are available from IBM here: http://www-03.ibm.com/systems/power/software/aix/linux/to

[git-users] Re: portable Git

I can't help with this, but I can't help wondering why you want to run git on an arbitrary machine. Also, do you mean on a host running Windows, Linux, one of the *BSD's? You can't have a git which will run regardless of the host OS. Of course, you might be able to have a Windows git in one sub

[git-users] Re: portable Git

Thanks. I guess it does, if you are install jenkins on a system to which you are not root. Have you considered, on your "base" system, something like: cd ~ git clone https://github.com/git/git cd git make configure ./configure --prefix=/jenkins/subdirectory/git #change as needed mkdir -p /jenkin

[git-users] Re: portable Git

OOPS, the zip command should be zip -R git-zip.zip git I forgot the -R switch to recurse the subdirectories. On Sunday, December 30, 2012 9:01:24 AM UTC-6, Gabby Romano wrote: > > hi all - does anyone know where I can fine a portable version of Git for > Linux so no install is needed (yum or an

Re: [git-users] Re: portable Git

gt; > On Monday, December 31, 2012 6:22:54 PM UTC+2, John McKown wrote: >> >> OOPS, the zip command should be >> >> zip -R git-zip.zip git >> >> I forgot the -R switch to recurse the subdirectories. >> >> On Sunday, December 30, 2012 9:01:24 AM UTC

Re: [git-users] Ignore files

name to the > .gitignore file would files already tracked stay in the log/history and that > future add/commits would now ignore those files? > > -- > > -- Maranatha! <>< John McKown --

[git-users] Re: Ignore files

Oh, and if you do revise the git repo, I don't know what will happen if you do a "git push" to a remote repo. It may fail. Or it may update the remote in such a way that others have problems doing a fetch or pull. Perhaps one of the very experienced will speak up on this issue. I really hate doi

Re: [git-users] Fully compatibly way to get git branch and current SHA

#current branch name git branch #or branch=$(git branch | cut -d ' ' -f 2) #sha of head head=$(cat .git/refs/heads/${branch} I don't know for certain that these will work for all releases. -- Maranatha! John McKown On Jan 3, 2013 9:41 PM, "Yoshiki Vázquez Baeza"

Re: [git-users] Re: Installing Dependent Libraries for Git

ply to you. I simply don't know. Sorry. On Sat, Jan 5, 2013 at 7:44 PM, wrote: > @John Mckown: I was referring the link provided by you i.e > http://icancompute.ca/aix/config/software/install-git-aix/. > While I was downloading the the necessary rpm files for installation I

Re: [git-users] Management of a puppet tree and multiple developers

small quantity, but sure to grow) are currently in the "devel" > branch as the result of a previous effort. > > I feel like this has to be easier than I'm making it, and I'm just going > about it the wrong way because I don't understand Git well enough. But the > documentation I've found doesn't really seem to describe how to solve this. > > -- > > -- Maranatha! <>< John McKown --

[git-users] Git off-site security

This may be a rather ignorant question. It is based on the thread: "Can Git do all of this?". Konstantin indicated that Web suppliers such as GitHub are not secure. Why is this? Well, I guess maybe they could be hacked from the outside, or perhaps an employee could be subverted. I am wondering w

Re: [git-users] Git off-site security

Thanks for explaining. I guess the way to do a "cloud backup" would be to do a "git archive" and then encrypt and scp the archive to the "cloud". On Wed, Jan 9, 2013 at 2:30 PM, Dale R. Worley wrote: >> From: John McKown >> >> This may be a rat

Re: [git-users] git merge: error: The following untracked working tree files would be overwritten by merge

why does Git not do something analogous? > (Afaics, update the HEAD, update the Index, but leave the working-copy > edition alone?) > > I searched for this beforehand, and most advice involves either stashing, or > with "git reset --hard" the loss of the untracked files. > > Best regards, > Carsten > > > > -- >Cafu - the open-source Game and Graphics Engine > for multiplayer, cross-platform, real-time 3D Action > Learn more at http://www.cafu.de > > -- > > -- Maranatha! <>< John McKown --

Re: [git-users] Re: Find Git repository mapping

remotes. These are other git >> repositories that contain more or less the same contents as you have >> locally. >> >> To see which remotes you currently have configured, use: >> >> git remote -v >> >> To see more details about a given remote, for example one called "origin" >> (which is the default name for the remote when you create the local repo by >> cloning it from the remote one), do: >> >> git remote show origin > > -- > > -- Maranatha! <>< John McKown --

Re: [git-users] how do I edit this particular web page...

the site uses)? The > email at the bottom bounces, as well. > > Any ideas here? > -roger- > > -- > > -- Maranatha! <>< John McKown --

[git-users] Interesting(?) article on setting up a small, local, git server for small development team.

http://www.howtoforge.com/debian-wheezy-local-git-server-with-git-lite-workflow This howto describes a shared local *git* [1] server setup for a small team. This is a repository layout that is familiar to anyone used to working with a traditional version control system. One of the tutorial obj

Re: [git-users] RE

Does anybody who is the least concerned about hacking ever go to a web site in an email such as this? If so, I have some wonderful "bottom land" in Louisiana for you. (bottom of the swamp, that is. ). On Mon, Jan 21, 2013 at 2:22 PM, Mark Janssen wrote: > > > -- > >

Re: [git-users] Trying to convert svn repos to Git repos

it report an error "Permission denied: Can't open > '/tmp/report.tmp' : ..." > > Anyone an idea what to try next? > Thanks in advance > > -- > > -- Maranatha! <>< John McKown --

Re: [git-users] Git on Windows, permission denied when directory structure does not match between branches

ccurs > when I switch branches with Git. If I restart the system the directory is > removed and I can continue, although this is a major drain on productivity > Is there another way to correct this issue or preferably avoid it > altogether? > > -- > > -- Maranatha! <>< John McKown --

Re: [git-users] acked by ,test by, how to add them. automatically? and what does it mean

; Tested-by: Tushar Behera > Signed-off-by: Russell King > > > I know git commit -s can add my self with "signed off by me" but how > to get acked by and tested by? > > > other 2 questions: > > 1) what does mean acked by? > > 2) what's the different for the first signed off with the last signed-off > > > Lei > > -- > > -- Maranatha! <>< John McKown --

Re: [git-users] back to old version

git reset HEAD^ You might to look at the --hard or --soft options. On Jan 24, 2013 8:35 PM, wrote: > Hy > > Today I commited two Java classes, but I didn't push.. > > how can I exclude my commit? I want my code like before my commit... > > I use e-git in eclipse.. but i can use git command line

[git-users] Re: What is the best way to use GIT for versioning Java Website

In addition to what Dale said, I have some basic questions. Do the developers have a unique UNIX UID which is tracked as the "owner" of the files in the JEE subdirectory? If so, then perhaps the simpliest thing to do is to stop using a "git add .", but instead do something like: git add $(find

[git-users] Re: What is the best way to use GIT for versioning Java Website

Slight goof in the previous message. Said: # Now I want to commit! git fetch #get any updates in the bare repo. git checkout master #switch to the master branch git merge my-name #merge in my changes into master Meant: # Now I want to commit! git checkout master #switch to master branch git pu

[git-users] OT: MS integrating git access into Visual Studio & TFS

I hope this is OK to post. I found it interesting. http://www.networkworld.com/news/2013/013013-microsoft-embraces-open-source-git-for-266280.html Microsoft is integrating the widely used Git

Re: [git-users] Re: Why Same Files show up with different Statuses in Git?

release 17 (Beefy Miracle) >>>> KDE: 4.9.5 >>>> >>>> git --version >>>> git version 1.7.11.7 >>>> >>>> Under Cygwin, the git version is 1.7.9. >>>> >>>> Finally, I did check the git configuration

Re: [git-users] Compiling Git on Linux..

Ubuntu installed git into /usr/bin. You installed it into /usr/local/bin. Normally, /usr/bin is before /usr/local/bin on the PATH. You can address this by putting /usr/local/bin on the PATH before /usr/bin. Or you, if you want to replace git, use the normal Ubuntu method to uninstall git. This will

Re: [git-users] Compiling Git on Linux..

Thanks for the info, I'm not familiar with Ubuntu. On Feb 3, 2013 3:04 PM, "Martin Møller Skarbiniks Pedersen" < traxpla...@gmail.com> wrote: > On 3 February 2013 18:56, John McKown > wrote: > > Ubuntu installed git into /usr/bin. You installed it into /usr/loc

Re: [git-users] Work with two repositories

t; group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- This is a test of the Emergency Broadcast System. If this ha

Re: [git-users] Usage of git for partly local / partly remote

s group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really t

Re: [git-users] error in git when switching to ssh.

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, visit https://groups.google.com/groups/opt_out. > > >

Re: [git-users] don't let you change branch with pending changes

My habit, when I am going to do something in a project is to: cd ~/project git branch # more commands just to remind me which branch is active immediately after I cd into the subdirectory. I have some subdirectories which are "duplicated" on multiple machines. The contents of each machine is in i

Re: [git-users] don't let you change branch with pending changes

That is really nice! Thanks for the pointer. -- 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, vi

Re: [git-users] Help with .gitignore

his is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we'd stick around to tell you? Maranatha! <>< John McKown -- You received this message because you are subscribed to the Google Groups "Git for human beings" g

Re: [git-users] Help with .gitignore

d an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we'd stick around to tell you?

Re: [git-users] Help with .gitignore

I guess my memory is failing. Thanks. -- 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, visit htt

Re: [git-users] To know the string in which branch

ow do you determine which branch contains a > file that contains ?" > > Dale > -- This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we'd stick around to tell you? Maranatha! <>< John McKown -- You receive

Re: [git-users] To know the string in which branch

As Larry Wall said "Tim Toady" (TMTOWTDI ), aka "There's More Than One Way To Do It". Which ever makes more sense to the programmer / user. I do admit to often using esoteric methods. On Thu, Feb 21, 2013 at 1:49 PM, Dale R. Worley wrote: > > From: John McKown &

Re: [git-users] git: Command not found.

group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > -- This is a test of the Emergency Broadcast System. If this had been an ac

Re: [git-users] Problem cloning a GIT repo, Out of memory, windows XP (32-bit)

le.com/groups/opt_out. > > > -- This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we'd stick around to tell you? Maranatha! <>< John McKown -- You received this message because you are subscribed to the Go

Re: [git-users] Re: git: Command not found.

s, visit https://groups.google.com/groups/opt_out. > > > -- This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we'd stick around to tell you? Maranatha! <>< John McKown -- You received this message because you are

Re: [git-users] Can I delete origin/HEAD origin/master to start new repo?

m it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we'd stick around to tell y

Re: [git-users] Using Git to track system file customizations

iving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we'd s

Re: [git-users] Deploying with git

ers+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we'd stick around to tell you? Maranatha! <><

Re: [git-users] recover from hard reset

ptions, visit https://groups.google.com/groups/opt_out. > > -- This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we'd stick around to tell you? Maranatha! <>< John McKown -- You received this message because you a

Re: [git-users] Somewhat quiet commit output?

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, visit https://groups.google.com/groups/opt_out. > > -- This is a test of the

Re: [git-users] proper meaning of '.' dot in a git command?

In UNIX commands, the period by itself means "the current directory" On May 16, 2013 5:41 PM, "Philip Oakley" wrote: > Recently there have been a couple of example commands that have a single > dot '.' in the command line. > > In this case what is its proper meaning, that is, is it expanded by th

Re: [git-users] Re: Problem with "git checkout --orphan"

ng list, but the use-case does sound a bit, well, pointless. > I'm sure it will help if you present them with a valid use-case that this > is important to fix: https://gist.github.com/tfnico/4441562 > > -- > You received this message because you are subscribed to the Google Groups > "Git

Re: [git-users] Copy full content of one repository to another

gt; To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- This is a test of the Emergency Broadcast System. If this had been an act

Re: [git-users] Git error

gle.com/groups/opt_out. > > > -- This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we'd stick around to tell you? Maranatha! <>< John McKown -- You received this message because you are subscribed to the Google

[git-users] best way to create & populate a new bare repository

script, passing it the name of the bare repository. Or maybe just assuming that the bare repository name is the same as the working directory name, with ".git" at the end. -- This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we

Re: [git-users] How best to show changes from a number of commits?

> -- This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we'd stick around to tell you? Maranatha! <>< John McKown -- You received this message because you are subscribed to the Google Groups "Git for human bein

Re: [git-users] newbie questions

everyone > does it correctly .. but if someone simply goes in by ftp and modifies > files, then git has no "control" over that .. is this correct? > > -- This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we'd stick around

Re: [git-users] newbie questions

;point in time snapshot", more or less. It can do more, but that is the big part of it, to me. It can tell you what change between snapshots and by whom (if you set it up that way) and other things. On Fri, Jun 28, 2013 at 3:27 PM, Ed Pataky wrote: > So you are saying that there i

Re: [git-users] newbie questions

n this in 5 years of using this computer > > > > -- This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we'd stick around to tell you? Maranatha! <>< John McKown -- You received this message because you are subscribed to the Goo

Re: [git-users] Re: Do I have to download all files?

That is part of the design of git. It is a _distributed_ system. Perhaps what you really want would be something like Subversion, in which a person checks out only those files they want to work on. With git, each person is supposed to get all the files and the entire modification history of them.

Re: [git-users] How to deal with concurrent changes in a project

cr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > -- This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we'd stick around to tell you? Maranatha! <>< John McKown

Re: [git-users] How to deal with concurrent changes in a project

and git push. Then just do a "git add -A ." On Tue, Jul 2, 2013 at 7:53 AM, John McKown wrote: > Caution: Not an expert by any means. > > What I would do is this. First, I would do a "git stash". > > > Use git stash when you want to record the current state of

Re: [git-users] URL return error doing git pull

mail to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we'd stick around to tell you? Maranatha! <&

Re: [git-users] URL return error doing git pull

On Fri, Jul 12, 2013 at 10:49 AM, John McKown wrote: > I am not an expert, but if you're repository is being accessed via HTTP:, > the 403 might be an HTTP result code. In HTTP-speak, it means "forbidden". > According to the documentation, and rendered in my own dialect

Re: [git-users] where is stored the staging area(index) on our machines

more options, visit https://groups.google.com/groups/opt_out. > > > -- This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we'd stick around to tell you? Maranatha! <>< John McKown -- You received this messa

Re: [git-users] Question about Git and Users

* > > ** ** > > Thanks, > > -- > 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...@googlegro

Re: [git-users] git on nfs is outrageously slow

ubscribed 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, visit https://groups.google.com/groups/opt_out. > > > --

Re: [git-users] git on nfs is outrageously slow

> filesystem, but my working directory on my local disk. It works well for me. > > hi john, can you explain me what do you mean by the above statement, > what's the workflow. do you clone only part of the tree to your local > disk ? > > On Wednesday, July 31, 2013 5:36:41

Re: [git-users] How do I remove a file from all branches in a git repository but leave it on the file system

ived 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, visit https://groups.google.com/grou

Re: [git-users] starting out with git -- a problem with branching....

subscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- As of next week, passwords will be entered in Morse code. Maranatha! <>< John

Re: [git-users] git log format without times and/or zone

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, visit https://groups.google.com/groups/opt_out. > -- As of next week, passwords will be entered in Morse

Re: [git-users] starting out with git -- a problem with branching....

For milestones, I either create a new branch at that commit point (rarely) or tag the commit with a nice name. On Tue, Sep 3, 2013 at 10:40 AM, David wrote: > On 4 September 2013 01:20, John McKown > wrote: > > If you don't want to do a commit, then do a stash. It puts the cu

Re: [git-users] renaming or aliasing commits

o unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- As of next week, passwords will be entered in Morse code. Maranatha! <>< John

Re: [git-users] git and sudo

group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- As of next week, passwords will be entered in Morse code. Maranatha! <>

[git-users] git pull: Observation for local / NFS bare repository

idea to mention this to the developers. IOW, are there many people who use a bare repository over a _slow_ NFS link? Or is it so rare that it would not be worth using up their time? Thanks for your thoughts on this. -- As of next week, passwords will be entered in Morse code. Maranatha! <>&

Re: [git-users] misandestanding

. > For more options, visit https://groups.google.com/groups/opt_out. > -- I have _not_ lost my mind! It is backed up on a flash drive somewhere. Maranatha! <>< John McKown -- You received this message because you are subscribed to the Google Groups "Git for human be

<    1   2