login
Header Space

 
 

Re: best git practices, was Re: Git User's Survey 2007 unfinished summarycontinued

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Johannes Schindelin <Johannes.Schindelin@...>
Cc: Andreas Ericsson <ae@...>, Jakub Narebski <jnareb@...>, <git@...>
Date: Monday, October 22, 2007 - 11:24 am

On Mon, 2007-10-22 at 12:04 +0100, Johannes Schindelin wrote:


The following are workflows that would be very useful for my cow-orkers
and project peers.

End-user workflows:

* Clone from another SCM (mostly svn).  Make a local branch to implement
something in various commits.  Rebase to the "latest upstream sources"
when you are done, and then do the equivalent to "svn dcommit" to upload
your final changes to the other SCM.  The use case for this is to fix a
complicated bug in GNOME, which uses SVN.

* While you are doing that, produce a patchset that you can send to the
maintainers for review.  I love "git-format-patch -n --thread --stdout >
foo", but it's pretty painful to have to 1. look up git-format-patch's
options in the man page (if you use --stdout, shouldn't -n and --thread
be turned on by default?); 2. import "foo" into Evolution to then be
able to edit the zeroth mail, and then be able to use Evo's SMTP
configuration to send out the mails while preserving the threading.

* Clone a git repository which has several interesting branches.  Figure
out which branch you are interested in.  Create a local branch based on
that; do your changes there.  Keep your code up to date (rebase?  when
to fetch / pull / etc?).

* You have a personal branch with a bunch of commits:  a mess of "real
work", "remove debugging printf", "fix typo", etc.  Reformat / reorder
those patches into something suitable for submission.  [I just found out
about git rebase --interactive and it's *FANTASTIC* for this!]

Maintainer workflows:

* Start a personal project in git and publish it for others to clone.
Assume several possible setups:  dumb web server with no git installed,
git installed but no git-daemon, git installed with git-daemon running.
I've found that publishing is not trivial at all; it's a rather
cumbersome multi-step process.

* Several of your contributors publish their own git repositories.
Integrate changes from them, or review them.  This interesting because
you'll have to do a lot of navigation in repos with which you aren't
familiar, you'll have to use the merging and conflict resolution tools,
you'll have to maintain the signoffs, etc.

* Set up a public repository to which other people can push.

* Publish just some of your branches.  Do that often, say, because you
have new work to show in each of those branches.

  Federico

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Re: Git User's Survey 2007 unfinished summary continued, Jakub Narebski, (Mon Oct 8, 4:55 pm)
Git User's Survey 2007 unfinished summary continued, Jakub Narebski, (Fri Oct 12, 6:08 pm)
Re: Git User's Survey 2007 unfinished summary continued, Shawn O. Pearce, (Fri Oct 12, 11:04 pm)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Fri Oct 12, 8:46 pm)
Re: Git User's Survey 2007 unfinished summary continued, Federico Mena Quintero, (Fri Oct 19, 4:57 pm)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Sat Oct 20, 4:03 am)
Re: Git User's Survey 2007 unfinished summary continued, Steffen Prohaska, (Sat Oct 20, 6:19 am)
Re: Git User's Survey 2007 unfinished summary continued, J. Bruce Fields, (Sun Oct 21, 6:12 pm)
Re: Git User's Survey 2007 unfinished summary continued, Jakub Narebski, (Sat Oct 20, 7:06 pm)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Sat Oct 20, 7:33 pm)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Sun Oct 21, 3:17 am)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Sun Oct 21, 6:15 pm)
Re: Git User's Survey 2007 unfinished summary continued, Steven Grimm, (Mon Oct 22, 6:53 pm)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Mon Oct 22, 3:59 am)
Re: Git User's Survey 2007 unfinished summary continued, Federico Mena Quintero, (Mon Oct 22, 10:53 am)
Re: Git User's Survey 2007 unfinished summary continued, Jakub Narebski, (Mon Oct 22, 7:27 pm)
Re: Git User's Survey 2007 unfinished summary continued, Jakub Narebski, (Mon Oct 22, 8:26 am)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Mon Oct 22, 10:29 am)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Mon Oct 22, 9:45 am)
best git practices, was Re: Git User's Survey 2007 unfinishe..., Johannes Schindelin, (Mon Oct 22, 7:04 am)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Federico Mena Quintero, (Mon Oct 22, 11:24 am)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Nguyen Thai Ngoc Duy, (Mon Oct 22, 9:36 am)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Johannes Schindelin, (Mon Oct 22, 9:38 am)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Johannes Schindelin, (Mon Oct 22, 9:48 am)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Andreas Ericsson, (Mon Oct 22, 10:31 am)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Johannes Schindelin, (Tue Oct 23, 6:58 am)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Federico Mena Quintero, (Thu Oct 25, 12:16 pm)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Johannes Schindelin, (Thu Oct 25, 6:07 am)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Johannes Schindelin, (Wed Oct 24, 6:17 pm)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Johannes Schindelin, (Thu Oct 25, 6:12 am)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Johannes Schindelin, (Thu Oct 25, 7:39 am)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Johannes Schindelin, (Wed Oct 24, 6:14 pm)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Federico Mena Quintero, (Thu Oct 25, 12:06 pm)
[PATCH] Make rebase smarter, Steven Walter, (Fri Oct 26, 12:41 am)
Re: [PATCH] Make rebase smarter, Johannes Schindelin, (Fri Oct 26, 5:57 am)
Re: [PATCH] Make rebase smarter, Andreas Ericsson, (Fri Oct 26, 3:42 am)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Federico Mena Quintero, (Thu Oct 25, 2:06 pm)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Johannes Schindelin, (Wed Oct 24, 7:28 pm)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Johannes Schindelin, (Thu Oct 25, 6:17 am)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Andreas Ericsson, (Thu Oct 25, 10:58 am)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Federico Mena Quintero, (Thu Oct 25, 2:02 pm)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Johannes Schindelin, (Thu Oct 25, 8:58 am)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Johannes Schindelin, (Thu Oct 25, 6:27 am)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Johannes Schindelin, (Mon Oct 22, 11:00 am)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Andreas Ericsson, (Mon Oct 22, 11:16 am)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Federico Mena Quintero, (Mon Oct 22, 3:36 pm)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Johannes Schindelin, (Mon Oct 22, 7:21 pm)
Re: best git practices, was Re: Git User's Survey 2007 unfin..., Steffen Prohaska, (Mon Oct 22, 11:42 am)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Sat Oct 20, 7:29 am)
Re: Git User's Survey 2007 unfinished summary continued, Dmitry Potapov, (Sun Oct 21, 2:08 am)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Fri Oct 19, 7:37 pm)
Re: Git User's Survey 2007 unfinished summary continued, Federico Mena Quintero, (Mon Oct 22, 10:28 am)
Re: Git User's Survey 2007 unfinished summary continued, Jakub Narebski, (Fri Oct 19, 7:27 pm)
Re: Git User's Survey 2007 unfinished summary continued, David Kastrup, (Sat Oct 13, 3:59 pm)
Re: Git User's Survey 2007 unfinished summary continued, Jakub Narebski, (Sun Oct 14, 5:49 pm)
Re: Git User's Survey 2007 unfinished summary continued, David Kastrup, (Sun Oct 14, 6:12 pm)
Re: Git User's Survey 2007 unfinished summary continued, Matthew Andrews, (Sun Oct 14, 6:23 pm)
Re: Git User's Survey 2007 unfinished summary continued, David Kastrup, (Sun Oct 14, 6:30 pm)
Re: Git User's Survey 2007 unfinished summary continued, Jakub Narebski, (Sun Oct 14, 6:15 pm)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Sun Oct 14, 6:08 pm)
Re: Git User's Survey 2007 unfinished summary continued, David Kastrup, (Sun Oct 14, 6:17 pm)
Re: Git User's Survey 2007 unfinished summary continued, J. Bruce Fields, (Sat Oct 13, 4:27 pm)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Sat Oct 13, 8:36 pm)
Re: Git User's Survey 2007 unfinished summary continued, Linus Torvalds, (Sat Oct 13, 9:13 pm)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Sat Oct 13, 10:06 pm)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Sun Oct 14, 4:45 am)
Re: Git User's Survey 2007 unfinished summary continued, David Kastrup, (Sun Oct 14, 5:21 am)
Re: Git User's Survey 2007 unfinished summary continued, Shawn O. Pearce, (Sat Oct 13, 9:44 pm)
Re: Git User's Survey 2007 unfinished summary continued, Steven Grimm, (Sun Oct 14, 2:12 pm)
Re: Git User's Survey 2007 unfinished summary continued, Nicolas Pitre, (Sun Oct 14, 3:44 pm)
Re: Git User's Survey 2007 unfinished summary continued, Shawn O. Pearce, (Mon Oct 15, 7:20 pm)
Re: Git User's Survey 2007 unfinished summary continued, Nicolas Pitre, (Mon Oct 15, 10:48 pm)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Tue Oct 16, 6:51 am)
Re: Git User's Survey 2007 unfinished summary continued, J. Bruce Fields, (Sun Oct 14, 2:40 pm)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Sun Oct 14, 3:50 pm)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Sun Oct 14, 4:18 pm)
Re: Git User's Survey 2007 unfinished summary continued, J. Bruce Fields, (Sun Oct 14, 4:24 pm)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Sun Oct 14, 4:22 pm)
Re: Git User's Survey 2007 unfinished summary continued, Steven Grimm, (Sun Oct 14, 3:25 pm)
Re: Git User's Survey 2007 unfinished summary continued, Linus Torvalds, (Sat Oct 13, 11:15 pm)
Re: Git User's Survey 2007 unfinished summary continued, Linus Torvalds, (Sat Oct 13, 11:55 pm)
Re: Git User's Survey 2007 unfinished summary continued, David Kastrup, (Sat Oct 13, 4:57 pm)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Sat Oct 13, 2:00 pm)
Re: Git User's Survey 2007 unfinished summary continued, Frank Lichtenheld, (Sat Oct 13, 8:58 am)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Sat Oct 13, 9:04 am)
Re: Git User's Survey 2007 unfinished summary continued, Shawn O. Pearce, (Fri Oct 12, 10:53 pm)
Re: Git User's Survey 2007 unfinished summary continued, J. Bruce Fields, (Fri Oct 12, 10:13 pm)
Re: Git User's Survey 2007 unfinished summary continued, Frank Lichtenheld, (Fri Oct 12, 7:36 pm)
speck-geostationary