[git-users] Re: How can I do commit by using ".git/MERGE_MSG" without editor after I resolved conflict?

2013-05-16 Thread Thomas Ferris Nicolaisen
On Thursday, May 16, 2013 4:42:19 AM UTC+2, seonguk.baek wrote: > Hi > > After I resolved conflict, how can I do commit by using ".git/MERGE_MSG" > without editor ? > > I did like below but It didn't work. > > $ cat .git/MERGE_MSG | git commit -m > > Is there any way? > Git commit

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

2013-05-16 Thread Konstantin Khomoutov
On Wed, 15 May 2013 18:53:10 -0500 John McKown wrote: > > If I run "git commit", Git will output a lot of detailed information > > about the commit: > > > > $ git commit -m 'Daily update.' > > [master bb56ea6] Daily update. > > 1477 files changed, 183898 insertions(+), 8 deletions(-) > > rewrit

[git-users] Given object file in Git, determine its path, or at least, its contents

2013-05-16 Thread Dale R. Worley
I have a brand new, large file in my repository. I know that its object file is: .git/objects/87/266d373359958e4fa9b51808ae076db9303923 I would like to determine the path name it has (and in which commit). I would also like to be able to extract its file contents (somewhat like "git show" would

Re: [git-users] Given object file in Git, determine its path, or at least, its contents

2013-05-16 Thread William Seiti Mizuta
William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Thu, May 16, 2013 at 1:14 PM, Dale R. Worley wrote: > I have a brand new, large file in my repository. I know that its > object file is: > > .git/objects/87/266d373359958e4fa9b51808ae076db9303923 > > I would li

[git-users] git svn fetch checksum mismatch - HELP

2013-05-16 Thread admin
Hi All, I am trying to convert my SVN repo to GIT using GIT-SVN and after a few commits being process am running in to following error Ashish-Shahs-Macbook-Pro: git svn fetch . . . r1878 = 79e09734fdb4916276da8273f25ecfbff37954a6 (refs/remotes/svn/nt/notecards) Checksum mismatch: dashboard-merg

Re: [git-users] git svn fetch checksum mismatch - HELP

2013-05-16 Thread Andy Hardy
On 16/05/2013 19:27, ad...@ashah.otherinbox.com wrote: > Hi All, > > I am trying to convert my SVN repo to GIT using GIT-SVN and after a few > commits being process am running in to following error > > Ashish-Shahs-Macbook-Pro: git svn fetch > . > . > . > r1878 = 79e09734fdb4916276da8273f25ecfbff

[git-users] GUI repository browser?

2013-05-16 Thread Dale R. Worley
What is a good GUI repository browser (under Linux)? I've just tried gitk, and it seems to be good enough, except there is no way to save a copy of a file in a commit -- you can *display* it, but you can't save it, as far as I can tell. Dale -- You received this message because you are subscrib

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

2013-05-16 Thread Philip Oakley
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 the bash shell, or by git it self, and what would its typical expanded version look like if it is the current dicetory e.g.

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

2013-05-16 Thread John McKown
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] proper meaning of '.' dot in a git command?

2013-05-16 Thread Joe Cabezas
as said earlier '.' means the directory itself many git commands are recursive when you use a path as argument so git add path/to/file.dat adds the 'file.dat' file, but git add path/to/dir/ add recursively all files in 'dir' directory SO git add . add all files in current directory,

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

2013-05-16 Thread Charles Manning
'.' is useful with things like git diff. git diff will show you all the diffs for the whole repo git diff . will show you just the diffs from the current directory and sub-directories. On Fri, May 17, 2013 at 11:44 AM, Joe Cabezas wrote: > as said earlier '.' means the directory itsel

Re: [git-users] GUI repository browser?

2013-05-16 Thread Gergely Polonkai
Hello, gitk is a repository browser. To create/modify commits, use git gui. I personally use these two tools, and Rabbit VCS (rabbitvcs.org as I recall), which integrates well with the most popular file managers. Best, Gergely On 17 May 2013 00:33, "Dale R. Worley" wrote: > What is a good GUI