git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org, "J. Bruce Fields" <bfields@fieldses.org>
Subject: Re: [PATCH] Documentation: A few minor fixes to Git User's Manual
Date: Tue, 03 Apr 2007 12:03:48 -0700	[thread overview]
Message-ID: <7vlkh9xotn.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <11756176481314-git-send-email-jnareb@gmail.com> (Jakub Narebski's message of "Tue, 3 Apr 2007 18:27:28 +0200")

Jakub Narebski <jnareb@gmail.com> writes:

> * no "detached head" feature (since 1.5.0.5 at least)

That is a 1.5.0 feature.

Care to volunteer to write that section?  I think illustrating
what you would want to achieve by detaching your HEAD would be
useful, and I offhand know of two different uses:

 - Sightseeing.  You do not intend to build on, but seek around
   to see what was there in the past.  Checking out a tag or a
   remote branch falls into this.

 - Rebuilding history.  When you want to futz with a commit 5
   revs ago, you would detach your HEAD to that commit, fix it
   up, and rebase the original branch on top of that detached
   HEAD.

I am sure people may have invented more creative ways to use it.
The topic probably belongs to "advanced user's manual", though.

> * uses ssh://host/path syntax instead of scp-like host:path
>   (which one is preferred? documentation has URL-like first)

My impression is that site:path is preferred.

> * no mention of receive.denyNonFastForwards (in about push)

I think the "Setting up a shared repository" section refers most
of the material to cvs-migration.txt, so you probably want to
add a sentence to "Advanced Shared Repository Management"
section in the latter.

> * inconsistent use of header levels

I am not sure what you are getting at.  

> * no git rebase --merge (e.g. renames)
> * git cherry-pick --no-commit + git commit, instead of
>   git cherry-pick + git commit --amend

It usually is not a good idea for a manual to show two ways to
do the same thing without explaining pros and cons.

I typically use rebase *without* --merge because it tends to be
faster (recently 'mailinfo' was broken for i18n contents, and I
had to use "rebase --merge" until it was fixed; now I can go
back to my old ways of running it without --merge ;-)).  I think
the only reason to use --merge is when you want the rename thing
in merge-recursive.

I do not think "cherry-pick -n + commit" vs "cherry-pick +
commit --amend" is an interesting contrast for a single commit.
Squashing more than one commit is why you would want to pick
without committing, which you cannot do with the latter.  So
they are not "instead of" -- they serve different purposes.

> * legitimate use of multiple root commits: joining projects
>   (e.g. git = git-core + git-tools (mail) + gitk + gitweb + git-gui)

I am not sure if you would even need to talk about it.  As long
as the document does not say "you shouldn't have more than one
root", I think we are Ok.

  parent reply	other threads:[~2007-04-03 19:03 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-04-03 16:27 [PATCH] Documentation: A few minor fixes to Git User's Manual Jakub Narebski
2007-04-03 17:21 ` J. Bruce Fields
2007-04-04 15:22   ` Jakub Narebski
2007-04-03 18:39 ` Junio C Hamano
2007-04-03 18:57   ` J. Bruce Fields
2007-04-03 19:03 ` Junio C Hamano [this message]
2007-04-04 18:31   ` Jakub Narebski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vlkh9xotn.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=bfields@fieldses.org \
    --cc=git@vger.kernel.org \
    --cc=jnareb@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).