From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 12 Jul 2010 06:47:29 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2-rc3~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/609eb9f7ff2af45d52ea90c0678a442d46aaa163?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Documentation: Spelling fix in protocol-capabilities.txt
checkout: accord documentation to what git does
t0005: work around strange $? in ksh when program terminated by a signal
---

609eb9f7ff2af45d52ea90c0678a442d46aaa163
diff --combined Documentation/git-checkout.txt
index 261dd90c38,7b83162223..1bacd2e104
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@@ -9,7 -9,7 +9,7 @@@ SYNOPSI
  --------
  [verse]
  'git checkout' [-q] [-f] [-m] [<branch>]
 -'git checkout' [-q] [-f] [-m] [-b <new_branch>] [<start_point>]
 +'git checkout' [-q] [-f] [-m] [[-b|--orphan] <new_branch>] [<start_point>]
  'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...
  'git checkout' --patch [<tree-ish>] [--] [<paths>...]
  
@@@ -98,31 -98,6 +98,31 @@@ explicitly give a name with '-b' in suc
  	Create the new branch's reflog; see linkgit:git-branch[1] for
  	details.
  
 +--orphan::
 +	Create a new 'orphan' branch, named <new_branch>, started from
 +	<start_point> and switch to it.  The first commit made on this
 +	new branch will have no parents and it will be the root of a new
 +	history totally disconnected from all the other branches and
 +	commits.
 ++
 +The index and the working tree are adjusted as if you had previously run
 +"git checkout <start_point>".  This allows you to start a new history
 +that records a set of paths similar to <start_point> by easily running
 +"git commit -a" to make the root commit.
 ++
 +This can be useful when you want to publish the tree from a commit
 +without exposing its full history. You might want to do this to publish
 +an open source branch of a project whose current tree is "clean", but
 +whose full history contains proprietary or otherwise encumbered bits of
 +code.
 ++
 +If you want to start a disconnected history that records a set of paths
 +that is totally different from the one of <start_point>, then you should
 +clear the index and the working tree right after creating the orphan
 +branch by running "git rm -rf ." from the top level of the working tree.
 +Afterwards you will be ready to prepare your new files, repopulating the
 +working tree, by copying them from elsewhere, extracting a tarball, etc.
 +
  -m::
  --merge::
  	When switching branches,
@@@ -263,7 -238,7 +263,7 @@@ the above checkout would fail like this
  +
  ------------
  $ git checkout mytopic
- fatal: Entry 'frotz' not uptodate. Cannot merge.
+ error: You have local changes to 'frotz'; not switching branches.
  ------------
  +
  You can give the `-m` flag to the command, which would try a