Stream

Join this community to post or comment

Reval Govender

Discussion  - 
 
I take you through exactly what Git Flow is and how to apply it to a team. 
11
7
Abramov Aleksei's profile photoChristian Gruenberg's profile photoJuan Pechiar's profile photoJames Munn, Jr.'s profile photo
7 comments
 
I like to think that your Git Flow (Git methodology, if we can call it that) depends on the project your are working on, rather than team size. It also depends on how you manage releases.

EDIT
In regards to "branching off master an committing to a develop branch", do you just merge these "develop" branches into master and hope it doesn't brake anything? Or am I not understanding your method properly?
Add a comment...

Jakub Narębski

Discussion  - 
 
A bit of shameless self-promotion: Packt have published a new book, "Mastering Git" on April 2016.
Git is one of the most popular types of Source Code Management (SCM) and Distributed Version Control System (DVCS). Despite the powerful and versatile nature of the tool envel...
27
8
Sr Kraken's profile photoJulio Garcia's profile photo
Add a comment...

Prasad Prechu

Discussion  - 
 
A Complete Resources for Learning Git & GitHub

#git #github #resources #tools #tutorials #books #references #cssauthor
Git is a huge subject, there is a lot of things to learn. This post is an overview of great resources for learning Git and Github.
14
5
Brian Smith's profile photoWidner  Millon Jr 's profile photoThomsen Wagner's profile photoAlejandra Cardiel's profile photo
2 comments
 
Thanks David
Add a comment...

Nadav Kavalerchik

Stories (success or horror)  - 
 
 
Artist painting in VR - HTC Vive & Tilt Brush
https://www.youtube.com/watch?v=WA_PSZj1sCs

I am still waiting to get mine. :(
28
11
Christoph Engelbert's profile photoSebastian Pick's profile photoIgor Maculan's profile photoJean-Pierre Mena's profile photo
2 comments
 
Sorry. was posted by accident.

Add a comment...

Holger Schauer

Discussion  - 
 
Meaningful aliases >> shortcuts
George Gritsouk, personal site. Articles about development, mostly.
28
11
Jesús Guerreiro Real de Asua's profile photoTomasz Nowak-Bańdura's profile photoMorten Enemark Lund's profile photoGraeme Geldenhuys's profile photo
5 comments
 
I have only two aliases.
t log --graph --oneline --decorate
and
ta log --graph ----oneline --decorate --all
Other than that I think bending your head once in a while keeps it flexible.
Add a comment...

Captain DevOps

Discussion  - 
 
 
19 Git tips for everyday user #Git   #webdev   #programming  
55
19
Блог программиста's profile photoJean-Christophe Cyr's profile photoKirill Palamartchouk's profile photoEmerson Castañeda's profile photo
2 comments
 
Ah nice one +Piotr Kotnis 
Add a comment...
 
Hi, I want to know about a workflow.. I have 4 different tickets to solve. Now I have been asked to do it in separate branches. Now when I do 1 fix, there I need to do some existing code fix also. And now when this branch is ready, and I am making another new branch, and starting to work on new ticket. But in this ticket, I need some changes that I made already in another branch. Now I am not sure how I can sync these branches.. so that when I push those branches, reviewer can review the code, and merge without any conflicting. Reviewer should be able to merge those 4 branches in any order. Please advise me.
1
Henrik Johansson's profile photoArup Rakshit's profile photo
4 comments
 
+Henrik Johansson  You are right. The reviewer is slow, and told not to wait for him. Create single branch for each fix, which will help him to do code review. That's fine. But shared code fix is creating problem, as I depicted in the original post.
Add a comment...

Git
owner

Discussion  - 
 
 
So... are we the second-most important userland application in Ubuntu (as far as the target audience of WSL is concerned), even more important than Ruby but not as important as Bash?
Overview. Windows provides developers with a familiar Bash environment. This environment will allow users to: Run common command line utilities such as grep , sed , and awk; Navigate the file system using these commands; Run bash shell scripts which rely on supported command line utilities ...
29
5
Christoph Grimmer-Dietrich's profile photomiguel rodriguez's profile photoJean-Noel Avila's profile photoLorenzo Lobba's profile photo
12 comments
 
+Serge Ribalchenko OK, but nobody has to say it, me and you didn't need it times ago.
Add a comment...

陈国民

Help Me  - 
 
I import my project from svn repo. All things are right except when I use 'git diff' or 'git show' commands, the texts do not show correctly. My files' encoding in the repo is cp936 and gui.encoding is uft8
1
Add a comment...

Coding Defined

Discussion  - 
 
How to get current branch name in Git
#git   #beginner   #branch  
3
Cyrille Pontvieux's profile photo
 
git rev-parse HEAD
Add a comment...

Created by

About this community

A place for user-to-user engagement of Git version control system.
 
Here's a comparison of merge applications for Git. It's put together by the community with pros and cons for each option. Hope you find it useful. :)
Get the answer to "What are the best merge applications for Git?" See a list of the top 7 options and learn their pros and cons.
18
7
Alan Olsen's profile photoMarcondes Maçaneiro's profile photoJames Wu's profile photoPhilipp Rüdinger's profile photo
3 comments
 
magit-ediff-resolve
Add a comment...
 
 
New edition of #gitrevnews is out! 
Git Rev News: Edition 15 (May 11th, 2016). Welcome to the 15th edition of Git Rev News, a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to subscribe, see the Git Rev News page on git.github.io. This edition covers what happened during the month ...
1
Add a comment...

BPS

Help Me  - 
 
Hello :)

Anyone can tell me what compression method git uses to compress files which will be transferred over net?

thanks :)
1
Nick Alcock's profile photoПЦ. Пц.'s profile photo
4 comments
 
zlib
Add a comment...
 
Thought that I would share this here. It's a little utility that a co-worker and I wrote a few years ago. We work on a F/OSS project where the other devs prefer cherry-pick over merge.

This little script allows you to cherry-pick all of the commits from branch A into branch B that are missing from branch B. The comments describe how it works.
A bash script to batch git cherry-pick of many commits from a single source branch. It can become a new git command if you save it in your path with a name like git-quickpick. Then, you can run i...
2
Jason Stephenson's profile photoMark Abraham's profile photo
16 comments
 
+James Raden They can be used to do the same broader operation, but the difference is in what they do with the HEAD of the current branch. Rebase changes history back as far as the common parent, because they all have new bases, and cherry-pick does not. This may or may not matter, and can be worked around (as in your example) by making branches that suit you.
Add a comment...

Nadav Kavalerchik

Stories (success or horror)  - 
 
git commit -m "$(curl -s http://whatthecommit.com/index.txt)";
I cannot believe that it took this long to write a test for this.
38
4
Johannes Huber's profile photoMarcel Kapfer (mmk2410)'s profile photo
Add a comment...
 
I think we forgot to share the recent editions of Git Rev News here... Oh well, here's the last one: http://git.github.io/rev_news/2016/04/20/edition-14/
Git Rev News: Edition 14 (April 20th, 2016). Welcome to the 14th edition of Git Rev News, a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to subscribe, see the Git Rev News page on git.github.io. This edition covers what happened during the ...
2
Add a comment...

GitMinutes

Discussion  - 
 
 
Episode 40 is out! Christian Couder reports from Git Merge 2016 with a bunch of interesting interviews.
Christian Couder went to Git Merge 2016 and recorded some interviews there for the podcast. Link to mp3 Listen to the episode on YouTube Here are the interviewees from the conference, all in this one episode: Roberto Ty...
1
GitMinutes's profile photoEvan Flechsig's profile photo
3 comments
 
Found this through the interview with bfg maker. Looks like I have quite the backlog :)
Add a comment...

Zander Wong

Help Me  - 
 
Git-daemon-run error happened when I attempt to install git-all
anyone know how to fix it?
1
Yuri Khan's profile photoZander Wong's profile photo
8 comments
 
+All thx to all guys. 
Add a comment...
 
Was thinking (again) about git hosting the other day and considering building a minimalist tool to help setting up repositories.

Assuming you have a server with an ssh access, the tool (let's call it tinyrepo) would be a command line tool installed on the server. It would let you create, rename, remove or list repositories from your workstation by running tinyrepo over ssh. For example to add a repo one would do:

ssh mysever tinyrepo add myrepo

tinyrepo would create a bare git repo in a predefined dir, maybe ~/public_html/git, enable the post commit hook for http access and print instructions to push to the repo (kind of like the instructions github provides when you create a repo there), as well as the read-only url for others to clone.

Other useful commands could be `tinyrepo ls`, `tinyrepo mv` or `tinyrepo rm`.

Does this sound useful? Is there something similar around?
1
Sitaram Chamarty's profile photoAurélien Gâteau's profile photo
19 comments
 
> But your README inspired me to think of adding an "rls" alias; that's the only significant thing I am missing

Interestingly, the ls command started as a plain ls, but I realized it would be nice to have repository urls as well, so that you can quickly clone a repository when setting up a new machine.

> One comment on the last section of your README ("shouldn't you host this on your own server?").  I doubt there's anyone with his head screwed on right who thinks software distribution channels should vary based on what the software actually is!

I agree but... you never know with people :)
Add a comment...

Git
owner

Discussion  - 
 
 
Git v2.7.4 (and updates to older maintenance tracks)

The latest maintenance release Git v2.7.4 is now available at the
usual places.  The same set of bugfix patches from the current
'master' have been backported to older maintenance tracks and are
available as v2.4.11, v2.5.5 and v2.6.6.  These are to fix a heap
corruption / buffer overflow bug and users are strongly encouraged
to upgrade.  The fix has already been in the release candidate
v2.8.0-rc3 as well.

The tarballs are found at:

    https://www.kernel.org/pub/software/scm/git/

The following public repositories all have a copy of the 'v2.7.4', 'v2.6.6', 'v2.5.5' and 'v2.4.11' tags:

  url = https://kernel.googlesource.com/pub/scm/git/git   url = git://repo.or.cz/alt-git.git   url = git://git.sourceforge.jp/gitroot/git-core/git.git   url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core   url = https://github.com/gitster/git
Index of /pub/software/scm/git. Name Last modified Size · Parent Directory - RPMS/ 03-Dec-2010 01:58 - debian/ 24-Dec-2005 08:56 - docs/ 06-Jun-2015 06:58 - testing/ 16-Mar-2016 22:21 - git-0.01.tar.gz 07-Apr-2005 21:25 40K git-0.01.tar.sign 08-Aug-2013 19:44 665 git-0.02.tar.gz 08-Apr-2005 ...
6
1
Copper's profile photoGomgoru Koee's profile photo
Copper
 
Hi am have a problem well I've had it for about 4 months the code on my devices was not wrote by me and I'm just trying to figure all this out so if you could direct me where to go I would like to help anyway I can please don't trick me like everyone else thanks

Add a comment...