Re: [DRAFT] Branching and merging with git

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Andreas Ericsson
Date: Tuesday, January 9, 2007 - 1:46 am

J. Bruce Fields wrote:

I like this, although fetch should probably have "--force" instead of 
the "+branch" notation. --force stands out more and users are familiar 
with --force possibly destroying things (rm -rf, anyone?).


I think the document is fine as it is, but could probably start off with 
a link to the tutorial, quickstart or a revised version of everyday.txt, 
stating that "here's something you might want to read if you prefer to 
experiment. If you think something goes wrong, come back here and find 
out why".


I found it quite sufficient. Perhaps it would be nice to include some 
more advanced examples, like octopus merges and things like that, 
although I feel such things could well live in an appendix to keep all 
the easy operations up front. Most people I know will most likely 
*never* use octopus merges. 90% of the merges we do here at work result 
in fast-forwards, so a real merge is already considered a bit odd.


Indeed. I for one like examples that tell me

# type this
# this will happen
# you can see what you just did with this, this, and this command
# this is because...

Not only is it good for learning the how and the why, but it also trains 
the fingers right from the start. Hopefully the UI is stabilized enough 
by now that we can reliably tell users how to accomplish a certain 
thing. UI changes must almost certainly be listed at whatever official 
site git has. As Junio has already pointed out, the members of the git 
mailing list are now in minority among the git users, so some other 
place has to hold the user-visible changes as well and the location of 
that site must probably be published along with the tools.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231
-
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:
[DRAFT] Branching and merging with git, linux, (Thu Nov 16, 3:17 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Thu Nov 16, 4:47 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Thu Nov 16, 6:09 pm)
Re: [DRAFT] Branching and merging with git, linux, (Thu Nov 16, 6:13 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Thu Nov 16, 6:31 pm)
Re: [DRAFT] Branching and merging with git, linux, (Thu Nov 16, 8:17 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Thu Nov 16, 10:55 pm)
Re: [DRAFT] Branching and merging with git, Theodore Tso, (Fri Nov 17, 8:32 am)
Re: [DRAFT] Branching and merging with git, Sean, (Fri Nov 17, 8:57 am)
Re: [DRAFT] Branching and merging with git, Nguyen Thai Ngoc Duy, (Fri Nov 17, 9:19 am)
Re: [DRAFT] Branching and merging with git, Marko Macek, (Fri Nov 17, 9:25 am)
Re: [DRAFT] Branching and merging with git, Petr Baudis, (Fri Nov 17, 9:33 am)
Re: [DRAFT] Branching and merging with git, Sean, (Fri Nov 17, 9:34 am)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Fri Nov 17, 10:44 am)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Fri Nov 17, 11:21 am)
Re: [DRAFT] Branching and merging with git, linux, (Fri Nov 17, 5:13 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Fri Nov 17, 5:40 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Fri Nov 17, 6:11 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Sun Nov 19, 10:50 am)
Git manuals, Petr Baudis, (Sun Nov 19, 10:59 am)
Re: Git manuals, J. Bruce Fields, (Sun Nov 19, 12:36 pm)
[DRAFT 2] Branching and merging with git, linux, (Mon Nov 20, 4:51 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Wed Nov 22, 4:51 am)
[PATCH] Documentation: add a "git user's manual", J. Bruce Fields, (Sat Nov 25, 9:01 pm)
Re: [DRAFT 2] Branching and merging with git, J. Bruce Fields, (Sun Dec 3, 6:19 pm)
Re: [DRAFT 2] Branching and merging with git, J. Bruce Fields, (Mon Dec 4, 12:23 am)
Re: [DRAFT 2] Branching and merging with git, Johannes Schindelin, (Mon Dec 4, 3:56 am)
Re: [DRAFT] Branching and merging with git, Theodore Tso, (Wed Jan 3, 10:04 am)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Wed Jan 3, 10:08 am)
Re: [DRAFT] Branching and merging with git, linux, (Wed Jan 3, 10:28 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Wed Jan 3, 11:11 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Sun Jan 7, 4:44 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Sun Jan 7, 5:24 pm)
Re: [DRAFT] Branching and merging with git, Theodore Tso, (Sun Jan 7, 5:40 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Sun Jan 7, 5:46 pm)
Re: [DRAFT] Branching and merging with git , Horst H. von Brand, (Sun Jan 7, 6:46 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Sun Jan 7, 7:22 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Sun Jan 7, 7:35 pm)
Re: [DRAFT] Branching and merging with git, Guilhem Bonnefille, (Mon Jan 8, 5:38 am)
Re: [DRAFT] Branching and merging with git, Theodore Tso, (Mon Jan 8, 7:03 am)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Mon Jan 8, 7:41 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Mon Jan 8, 9:17 pm)
Re: [DRAFT] Branching and merging with git, Andreas Ericsson, (Tue Jan 9, 1:46 am)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Tue Jan 9, 8:49 am)
Re: [DRAFT] Branching and merging with git, Theodore Tso, (Tue Jan 9, 9:58 am)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Tue Jan 9, 9:15 pm)