Re: [git-users] total newbie question

2011-08-03 Thread PJ Weisberg
On Wednesday, August 3, 2011, Michael Hazen wrote: So impossible or not, What I see is a changed file showing up in the master after a commit but not a merge. This is especially obvious if a file is added. I may be misunderstanding something, however. How are you

Re: [git-users] git tag -l - where are the associated

2011-08-13 Thread PJ Weisberg
On Saturday, August 13, 2011, Phlip wrote: tx guy- - got a list of tags? $ git tag -l -moar TagOne 9a03e83hashhashhash TagTwo 9b03e83hashhashhash TagThree 8ea330ahashhashhash ? Just curious... for x in $(git tag -l); do echo $x\t$(git rev-parse

Re: [git-users] git pull origin branch

2011-08-21 Thread PJ Weisberg
On Sunday, August 21, 2011, Mark Liversedge wrote: Hi, Dumb question. I'm working on a branch locally that is also over at github. I fetch the latest from github with: Make sure I'm clean $ git checkout branch $ git reset --hard origin/branch $ git pull origin branch

Re: [git-users] Branches and workflow

2011-08-26 Thread PJ Weisberg
On Friday, August 26, 2011, gitlist wrote: Thanks for the reply. It's not really bugfixes that's the issue, it's how to handle overlapping development of two features. Feature 1 is being tested by the customer; I need to start work on Feature 2. But where to begin the Feature

[git-users] commit to github fork

2011-09-09 Thread PJ Weisberg
$ git remote add mine read+write URL $ git push mine On Friday, September 9, 2011, Johannes Müller wrote: Hi, I cloned a repository from github, changed my working copy and then forked the repository on github. What is the easiest way to commit my changes to the

Re: [git-users] Viewing html

2011-09-13 Thread PJ Weisberg
On Tuesday, September 13, 2011, er wrote: -rw-r--r-- 1 root staff 11 Aug 28 21:43 c_array/doc/html/c_array_HTML.manifest -rw-r--r-- 1 root staff 12998 Sep 2 21:58 c_array/doc/html/index.html drwxr-xr-x 4 root staff 136 Aug 28 17:32 c_array/doc/html/ uid=502(er)

Re: [git-users] Why does git log same-hash same-hash file return two commits?

2011-10-06 Thread PJ Weisberg
On Thu, Oct 6, 2011 at 9:27 AM, Konstantin Khomoutov wrote: The correct way instead is to do $ git log 7de0e15^..7de0e15 myfile that is, the set of changes between the (first) parent of 7de0e15 and 7de0e15. Note: That causes an error if 7de0e15 is the root

Re: [git-users] Re: Why does this happen (unexpected git behaviour)

2011-11-12 Thread PJ Weisberg
On Sat, Nov 12, 2011 at 9:14 PM, tombert wrote: Interesting - but I found this explanation in the manual: --merge When switching branches, if you have local modifications to one or more files that are different between the current branch and the branch to which you are

[git-users] Git revision number

2011-11-17 Thread PJ Weisberg
I'm looking for something in Git analogous to the revision numbers in Subversion. Pretty much exactly what you get from `git describe', but I don't want it to be dependent on any tags or refs. Is there any way to get something like that out of Git? -PJ -- You received this message because you

Re: [git-users] Git revision number

2011-11-18 Thread PJ Weisberg
On Thu, Nov 17, 2011 at 10:19 PM, David Aguilar wrote: On Nov 17, 2011, at 9:11 PM, PJ Weisberg wrote: I'm looking for something in Git analogous to the revision numbers in Subversion.  Pretty much exactly what you get from `git describe

[git-users] Re: Git revision number

2011-11-20 Thread PJ Weisberg
On Saturday, November 19, 2011, Konstantin Khomoutov wrote: On Fri, 18 Nov 2011 12:20:03 -0800 PJ Weisberg wrote: The more I think about it, though, the more I think I could probably get away with using a timestamp for what I had

Re: [git-users] Git Revert Error Message?

2011-11-30 Thread PJ Weisberg
You have A--B and you want A--B--C where the state of C is identical to the state of A, correct? Then you should run: git revert B The commit(s) you pass to `git revert' are the commits you want to undo, not the state that you want to roll back to. -PJ -- You received this message

Re: [git-users] Checking in another user's local changes to a remote repository without his password?

2012-01-22 Thread PJ Weisberg
On Sun, Jan 22, 2012 at 12:12 AM, dspfun wrote: Hi! The setup is that there is a remote repository at some site, and then each person/developer has his own local clone of the remote repository. To push any changes from a local repository to the remote repository a

Re: [git-users] need clarification on interactive rebase, please

2012-03-22 Thread PJ Weisberg
On Wednesday, March 21, 2012, Les Nightingill wrote: Solved! (not entirely sure why, though!). Posting the solution here for future Googlers. The solution is on StackOverflow The solution is

Re: [git-users] Can I fix this problem with branch renaming?

2012-03-22 Thread PJ Weisberg
On Thursday, March 22, 2012, tombert wrote: Interesting post, but this puzzles me: On Thursday, March 22, 2012 8:52:12 AM UTC+1, radovan bast wrote: obviously i wouldn't do this if you have already pushed the commits I guess it is a problem if some other people commit on

[git-users] GIT: cloning from godaddy.

2012-03-25 Thread PJ Weisberg
On Sunday, March 25, 2012, Whitehorse06 wrote: a) git clone ssh:// me.txt (note xxx) is changed for privacy reasons. I get the following error message Cloning into Readme.txt... fatal: Invalid gitfile format:

Re: [git-users] push origin master/branch

2012-04-13 Thread PJ Weisberg
On Fri, Apr 13, 2012 at 4:47 PM, THUFIR HAWAT wrote: I find this terminology confusing.  Doesn't the master contain the branch? So, why can't I push a branch against the master?  If I've checked out branch x, the push will be applied to that branch, I would expect.

Re: [git-users] Amending a commit into different branches

2012-06-20 Thread PJ Weisberg
Not sure what happened there...according to my Sent folder, they went out from Thunderbird on my end as monospace/plaintext and based on what I see in gmane, it came out correctly there. Sorry if something was set wrong. It couldn't be in monospace *and* plaintext. Plain text doesn't

Re: [git-users] beginner branch question

2012-06-27 Thread PJ Weisberg
On Tuesday, June 26, 2012, Mostafa Alshrief wrote: If any of the uncommitted changes collide with files changed between branches, it will refuse to switch, and ask you to stash the changes first what do you mean by collide with files..? If A.txt on master is

Re: [git-users] git server problem

2012-07-02 Thread PJ Weisberg
On Monday, July 2, 2012, Avner Tamir wrote: ,Hi I’ve set git server on RHEL 5.6 box, running on httpd we’ve encountered the following scenario several times User A pushes to remote User B pull from remote User B sees the sources pushed by user A as to be

Re: [git-users] git branching from tags

2012-07-02 Thread PJ Weisberg
On Monday, July 2, 2012, jack sparrow wrote: From the git repo, i created a new branch1 with the existing tag tag1. i made some changes to a set of files, filea, fileb. If i run git status it shows that the filea and fileb are modified, so far good. Now i created another

Re: [git-users] beginner branch question

2012-07-03 Thread PJ Weisberg
On Tuesday, July 3, 2012, jack sparrow wrote: I don't understand why each branch has to be related to one another. Here's my thought, i should be able to create multiple branches each possibly with certain tag version. The work done in each branch can be on completely

Re: [git-users] git erase everything

2012-07-06 Thread PJ Weisberg
On Fri, Jul 6, 2012 at 3:55 AM, lem torov wrote: i was using netbeans ide and as CVS i was using git included into IDE. once i lanch standalone git-msys in my project directory git branch showed me * no branch master you are not in any branch i did git checkout

Re: [git-users] git contents model

2012-07-13 Thread PJ Weisberg
On Fri, Jul 13, 2012 at 5:38 AM, Angelo Borsotti wrote: Hi, I guess that a tarball would be the distro of the project, i.e. what is deployed, while a released project should contain the .git repo, with all the history in it so as to let future developers have all

Re: [git-users] git contents model

2012-07-16 Thread PJ Weisberg
On Sat, Jul 14, 2012 at 12:12 AM, Angelo Borsotti wrote: Hi P.J. exactly. That is the answer. Surfing the web I have seen that bare repositories are supported only in git 1.7. Since it is (and was) not possible to push to a non-bare repository, I wander how the

Re: [git-users] Beginner stuck in a commit

2012-08-07 Thread PJ Weisberg
On Mon, Aug 6, 2012 at 9:03 PM, Daniel P. Wright wrote: The default editor for git is vim, which is a sensible choice as its available on nearly every platform, but if you've never encountered it before it can seem a little... unusual. I'm not sure a text-editor is sensible

Re: [git-users] force merge to fix conflicts?

2012-08-09 Thread PJ Weisberg
On Thursday, August 9, 2012, THUFIR HAWAT wrote: I think that I do want to zap the master branch; git reset --hard origin will delete everything in origin, or just everything in master on origin? In this case, I'm using github. 'git reset' always affects the branch you

Re: [git-users] git svn clone on Windows

2012-08-30 Thread PJ Weisberg
On Thu, Aug 30, 2012 at 2:30 PM, Scott Anderson wrote: Has anyone had any success with 'git svn clone' on Windows? I'm new to git. We've been using subversion and I've been elected to migrate our existing projects to git. I'm using version 1.7.11-preview20120710 and

Re: [git-users] Why git merge always ask for a commit message?

2012-09-05 Thread PJ Weisberg
On Tuesday, September 4, 2012, Mauro wrote: There is a way now to make a fast-forward merge? Or I must delete brand devel and recreate? Thanks for your answers and your patience. Just merge master into devel -- -PJ Gehm's Corollary to Clark's Law: Any technology

Re: [git-users] about git commit -m add the more than two lines log

2012-10-11 Thread PJ Weisberg
On Thu, Oct 11, 2012 at 7:58 PM, lei yang wrote: I know git commit -m somethingsomething will give the git info in the git log but I don't know how to write some thing with more than two line some thing like something something something something something

Re: [git-users] git repo muddled up

2012-10-12 Thread PJ Weisberg
On Wednesday, October 10, 2012, maxhodges wrote: I have a git repo with multiple origin branches. WHen I add a new branch and commit changes, it shows that each of these branches are identical, so it may be writing the commits to multiple branches. I think made I made

Re: [git-users] Unable to push

2012-11-05 Thread PJ Weisberg
On Monday, November 5, 2012, kramer.newsreader wrote: * nov20127fc7d04 [origin/nov2012] Little more javadoc ... remotes/origin/nov2012 7fc7d04 Little more javadoc Same commit on both the local and remote branches. It looks like you have

Re: [git-users] Track changing imports when using git mv on Python project

2012-11-16 Thread PJ Weisberg
On Fri, Nov 16, 2012 at 3:13 PM, Mario wrote: I am currently totally rearranging a python project, which mainly means changing file names and moving folders and files. Therefore I user git mv and changes go very fast. Unfortunately I have to fix all the hanged

Re: [git-users] Git rebase for cleanup, after pushing

2013-05-30 Thread PJ Weisberg
On May 30, 2013 6:32 PM, Paul Smith However, I've already pushed my branch to master. I know rebasing stuff you've already pushed is considered a no-no in general, but I can't avoid it. Does anyone have suggestions for how to make this work better? Should I be

Re: [git-users] Clarification Regarding Git Commit Granularity

2013-06-06 Thread PJ Weisberg
On Jun 6, 2013 9:59 PM, Greg Chetcuti wrote: So, one thing I'm still a bit fuzzy on is the recommend granularity of commits, and I'm wondering if anyone can help me out. For example, let's say we're adding a new feature to a software application that's going to require two

Re: [git-users] Difficulty adding a symbolic link

2013-06-13 Thread PJ Weisberg
On Jun 13, 2013 11:45 AM, Dale R. Worley wrote: . The difficulty is that git add seems to not add specific files, depending on how they are specified as arguments to git add. In particular, /dev/dvd (which is a symbolic link) can be added with git add ../../dev/dvd but

Re: [git-users] Applying patch to Drupal module

2013-06-24 Thread PJ Weisberg
On Jun 24, 2013 8:08 AM, PJ Weisberg wrote: Try !git apply example.patch. Not just for Git, but for any commands you want to run on the remote machine. Oops, I remembered that wrong. That's the syntax for running a local command without exiting the ftp client. If you

Re: [git-users] Applying patch to Drupal module

2013-06-24 Thread PJ Weisberg
On Jun 24, 2013 8:20 AM, Konstantin Khomoutov wrote: On Mon, 24 Jun 2013 08:08:49 -0700 PJ Weisberg wrote: [...] Are you trying to run git commands inside an ftp client, rather than in a shell? Try !git apply example.patch

Re: [git-users] git bisect fixed/unfixed option

2013-07-10 Thread PJ Weisberg
On Jul 9, 2013 10:11 AM, Chemsi Mehdi wrote: Dear Git expert, I wonder how adding to git bisect fixed/unfixed options. This in order to find a good patch fixing a bug and not to find the bad commit. This is helpful for me. I am working with git version Can you

Re: [git-users] git error when trying to push one commit

2013-07-10 Thread PJ Weisberg
On Jul 10, 2013 12:07 PM, Richard Marais wrote: ... Here is the list of commits, not the position of 72ba712: I've noted it. It's not a descendant of origin/master. Pushing it as origin/master would effectively discard 3a55dca. I believe what you want to do is

Re: [git-users] error during git pull

2013-08-27 Thread PJ Weisberg
On Aug 26, 2013 10:46 PM, dexter ietf wrote: i thought this would be the cause and none of my commit has one/tgt tracked, i confirmed it by running 'git log' which doesn't list 'one/tgt' as a committed file. so i'm sure i haven't committed that file. That means that if

Re: [git-users] restrict history/messages on push?

2013-09-26 Thread PJ Weisberg
On Sep 26, 2013 12:05 AM, Gergely Polonkai wrote: Hello, first of all, Fred should stop using such commit messages :-) Seriously speaking, I think that's where git rebase -i comes in. Before pushing, rebase on the last public commit, and edit/squash the unnecessary

Re: [git-users] Switching to another hash on branch

2013-10-16 Thread PJ Weisberg
On Oct 16, 2013 5:51 AM, Roy Vardi wrote: Say I have a commit hash which is shared by two branches (I cherry-picked it from one branch to the other). The hash is a SHA-1 hash of all the commit metadata: tree, timestamp, *parent*, etc. A commit created by cherry-picking will

Re: [git-users] How to merge seperate repositories as branches in new repository?

2013-10-19 Thread PJ Weisberg
On Oct 18, 2013 12:29 PM, Casper Schmidt wrote: My question is then: Is there any way to merge multiple repositories into a single repository but in their own branch. I have found a few guidelines using multiple remotes and simple merge but this merges the history into the

Re: [git-users] Empty Commit?

2013-10-22 Thread PJ Weisberg
On Oct 22, 2013 11:21 AM, Vicki Kozel wrote: This is what git status shows after I modified the file and ran git add: git status # On branch fix99 # Changes to be committed: # (use git reset HEAD file... to unstage) # # modified: COMMON/pom.xml # This is what

Re: [git-users] Empty Commit?

2013-10-22 Thread PJ Weisberg
On Tue, Oct 22, 2013 at 1:55 PM, Vicki Kozel wrote: Hi Marcelo, I do not want to abandon this change, I want to keep it and the commit unchanged. I think this is a good practice in Gerrit to keep adding patches to the same change - to the same commit - which allows for

Re: [git-users] Empty Commit?

2013-10-23 Thread PJ Weisberg
On Oct 22, 2013 5:39 PM, PJ Weisberg wrote: On Tue, Oct 22, 2013 at 1:55 PM, Vicki Kozel wrote: Hi Marcelo, I do not want to abandon this change, I want to keep it and the commit unchanged. I think this is a good practice in Gerrit to keep

Re: [git-users] Another easy merge question

2013-10-30 Thread PJ Weisberg
On Oct 30, 2013 10:40 AM, Eric Fowler wrote: Given that I have already made a commit of my new changes in master (but not a push), is this still the way to go? That'll work fine. You could also do 'git checkout origin/master' to leave your local master branch the way it

Re: [git-users] Re: git clean help

2013-11-12 Thread PJ Weisberg
On Nov 12, 2013 7:32 PM, David R wrote: $ git status # On branch master # Untracked files: #(use git add file... to include in what will be committed) # # Spoon-Knife/ nothing added to commit but untracked files present (use git add to track) the

Re: [git-users] After git -am commit changed files are not in repo

2013-11-14 Thread PJ Weisberg
On Nov 14, 2013 7:53 PM, Dave Kennedy wrote: I have a git repository cloned to an AWS server. But my commits are not showing up in the repository even though there is no error when I commit a file. Is it OK to make commits as root or do I need to login with a git user name

Re: [git-users] security issue with public keys

2013-11-18 Thread PJ Weisberg
On Nov 17, 2013 8:43 PM, wrote: I generated ssh public keys on server, uploaded it to github repository, so that I can deploy my project to the server. My question is if someone has access to the server and they log in and view the ssh keys, can they somehow read or write to

Re: [git-users] Re: Merging from pull

2013-12-07 Thread PJ Weisberg
On Dec 6, 2013 7:32 PM, Phillip Tutt wrote: This is the bit that doesn't make sense: 1. Remote last log entry: 2013-11-04 Phil ticketing and questions working admintemplate 4a09c3 2. Desktop last log entries, note, the last commit was after I had to fix the merge

Re: [git-users] Re: Merging from pull

2013-12-07 Thread PJ Weisberg
On Dec 7, 2013 11:32 AM, Phillip Tutt wrote: Yes it does. That commit is just prior to commencing work on the laptop. What Huu said about using git clone instead of git init/pull on the laptop sounds like it could have caused the issue. I will need to reset to the last