{"thread":{"id":"14557","subject":"1.6.0-rc0 tagged","startedAt":"2008-07-21T06:20:30Z","lastAt":"2008-07-21T10:51:02Z","messageCount":3,"participants":["Junio C Hamano","Jakub Narebski","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"84141","messageId":"7vd4l7wyfl.fsf@gitster.siamese.dyndns.org","threadId":"14557","inReplyTo":null,"subject":"1.6.0-rc0 tagged","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-07-21T06:20:30Z","receivedAt":"2008-07-21T06:20:30Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"I've tagged and pushed out v1.6.0-rc0 tonight.  Those who are not\nfollowing the git development regularly should take note and please have a\nserious look at it, as the upcoming v1.6.0 release will bring in major\nusability and modernization changes that we have been announcing/warning\nin Release Notes for the past few releases.\n\n * Most subprograms such as git-cat-file will be installed outside your\n   $PATH by default.  Your \"/bin/ls /usr/bin\" will be much smaller as all\n   of you have been asking, but you may have to update your scripts as\n   outlined in the release notes for v1.5.4.\n\n * The new release in the default configuration will produce packfile and\n   pack idx files that won't be accessible by git older than v1.4.4.5.  By\n   now, those who use git for anything serious should be using v1.5.3 or\n   later anyway, though.\n\n * The \".dotest\" temporary area \"git am\" and \"git rebase\" use will be\n   moved to $GIT_DIR/rebase.  We might change it to $GIT_DIR/rebase-apply\n   which would be more logical name before the final, though.\n\nPeople who have regularly followed 'master' (and 'next') should not take\nthis tag too seriously; there is nothing surprising about it since the\nlast issue of \"What's cooking/What's in\".\n"},{"id":"84158","messageId":"m3k5ffwsma.fsf@localhost.localdomain","threadId":"14557","inReplyTo":"7vd4l7wyfl.fsf@gitster.siamese.dyndns.org","subject":"Re: 1.6.0-rc0 tagged","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-07-21T08:26:12Z","receivedAt":"2008-07-21T08:26:12Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n>  * The \".dotest\" temporary area \"git am\" and \"git rebase\" use will be\n>    moved to $GIT_DIR/rebase.  We might change it to $GIT_DIR/rebase-apply\n>    which would be more logical name before the final, though.\n\nVery good idea.  $GIT_DIR/rebase looks slightly strange with git-am.\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"84174","messageId":"alpine.DEB.1.00.0807211246370.3305@eeepc-johanness","threadId":"14557","inReplyTo":"m3k5ffwsma.fsf@localhost.localdomain","subject":"[PATCH] Rename .git/rebase to .git/rebase-apply","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-07-21T10:51:02Z","receivedAt":"2008-07-21T10:51:02Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nWith git-am, it sounds awkward to have the patches in \".git/rebase/\",\nbut for technical reasons, we have to keep the same directory name\nfor git-am and git-rebase. \".git/rebase-apply\" seems to be a good\ncompromise.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n\n\tOn Mon, 21 Jul 2008, Jakub Narebski wrote:\n\n\t> Junio C Hamano <gitster@pobox.com> writes:\n\t> \n\t> >  * The \".dotest\" temporary area \"git am\" and \"git rebase\" use \n\t> >    will be moved to $GIT_DIR/rebase.  We might change it to \n\t> >    $GIT_DIR/rebase-apply which would be more logical name before\n\t> >    the final, though.\n\t> \n\t> Very good idea.  $GIT_DIR/rebase looks slightly strange with git-am.\n\n\tSince I was responsible for the patch in the first place, here is \n\ta follow-up patch to imlement the rebase-apply thing.\n\n Documentation/SubmittingPatches        |    2 +-\n Documentation/git-am.txt               |    4 +-\n Documentation/git-rebase.txt           |    4 +-\n Documentation/user-manual.txt          |    2 +-\n contrib/completion/git-completion.bash |   10 +++---\n contrib/emacs/git.el                   |    8 ++--\n git-am.sh                              |    2 +-\n git-quiltimport.sh                     |    2 +-\n git-rebase.sh                          |   48 ++++++++++++++++---------------\n t/t3401-rebase-partial.sh              |    2 +-\n t/t3407-rebase-abort.sh                |    2 +-\n t/t4150-am.sh                          |   22 +++++++-------\n t/t9106-git-svn-commit-diff-clobber.sh |    4 ++-\n 13 files changed, 58 insertions(+), 54 deletions(-)\n\ndiff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches\nindex fdfa536..841bead 100644\n--- a/Documentation/SubmittingPatches\n+++ b/Documentation/SubmittingPatches\n@@ -301,7 +301,7 @@ If it does not apply correctly, there can be various reasons.\n   patch appropriately.\n \n * Your MUA corrupted your patch; \"am\" would complain that\n-  the patch does not apply.  Look at .git/rebase/ subdirectory and\n+  the patch does not apply.  Look at .git/rebase-apply/ subdirectory and\n   see what 'patch' file contains and check for the common\n   corruption patterns mentioned above.\n \ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex e010a16..ee335ae 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -143,9 +143,9 @@ aborts in the middle,.  You can recover from this in one of two ways:\n   the index file to bring it in a state that the patch should\n   have produced.  Then run the command with '--resolved' option.\n \n-The command refuses to process new mailboxes while `.git/rebase`\n+The command refuses to process new mailboxes while `.git/rebase-apply`\n directory exists, so if you decide to start over from scratch,\n-run `rm -f -r .git/rebase` before running the command with mailbox\n+run `rm -f -r .git/rebase-apply` before running the command with mailbox\n names.\n \n Before any patches are applied, ORIG_HEAD is set to the tip of the\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 51afc87..0764b3c 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -39,8 +39,8 @@ It is possible that a merge failure will prevent this process from being\n completely automatic.  You will have to resolve any such merge failure\n and run `git rebase --continue`.  Another option is to bypass the commit\n that caused the merge failure with `git rebase --skip`.  To restore the\n-original <branch> and remove the .git/rebase working files, use the command\n-`git rebase --abort` instead.\n+original <branch> and remove the .git/rebase-apply working files, use the\n+command `git rebase --abort` instead.\n \n Assume the following history exists and the current branch is \"topic\":\n \ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 8761ee7..c5641af 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -2431,7 +2431,7 @@ $ git rebase origin\n -------------------------------------------------\n \n This will remove each of your commits from mywork, temporarily saving\n-them as patches (in a directory named \".git/rebase\"), update mywork to\n+them as patches (in a directory named \".git/rebase-apply\"), update mywork to\n point at the latest version of origin, then apply each of the saved\n patches to the new mywork.  The result will look like:\n \ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 29f6cd4..2edb341 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -73,12 +73,12 @@ __git_ps1 ()\n \tif [ -n \"$g\" ]; then\n \t\tlocal r\n \t\tlocal b\n-\t\tif [ -d \"$g/rebase\" ]\n+\t\tif [ -d \"$g/rebase-apply\" ]\n \t\tthen\n-\t\t\tif test -f \"$g/rebase/rebasing\"\n+\t\t\tif test -f \"$g/rebase-apply/rebasing\"\n \t\t\tthen\n \t\t\t\tr=\"|REBASE\"\n-\t\t\telif test -f \"$g/rebase/applying\"\n+\t\t\telif test -f \"$g/rebase-apply/applying\"\n \t\t\tthen\n \t\t\t\tr=\"|AM\"\n \t\t\telse\n@@ -488,7 +488,7 @@ __git_whitespacelist=\"nowarn warn error error-all strip\"\n _git_am ()\n {\n \tlocal cur=\"${COMP_WORDS[COMP_CWORD]}\" dir=\"$(__gitdir)\"\n-\tif [ -d \"$dir\"/rebase ]; then\n+\tif [ -d \"$dir\"/rebase-apply ]; then\n \t\t__gitcomp \"--skip --resolved\"\n \t\treturn\n \tfi\n@@ -915,7 +915,7 @@ _git_push ()\n _git_rebase ()\n {\n \tlocal cur=\"${COMP_WORDS[COMP_CWORD]}\" dir=\"$(__gitdir)\"\n-\tif [ -d \"$dir\"/rebase ] || [ -d \"$dir\"/rebase-merge ]; then\n+\tif [ -d \"$dir\"/rebase-apply ] || [ -d \"$dir\"/rebase-merge ]; then\n \t\t__gitcomp \"--continue --skip --abort\"\n \t\treturn\n \tfi\ndiff --git a/contrib/emacs/git.el b/contrib/emacs/git.el\nindex 43b059b..c1cf1cb 100644\n--- a/contrib/emacs/git.el\n+++ b/contrib/emacs/git.el\n@@ -1252,8 +1252,8 @@ Return the list of files that haven't been handled.\"\n        \"\\n\")\n       (when subject (insert subject \"\\n\\n\"))\n       (cond (msg (insert msg \"\\n\"))\n-            ((file-readable-p \".git/rebase/msg\")\n-             (insert-file-contents \".git/rebase/msg\"))\n+            ((file-readable-p \".git/rebase-apply/msg\")\n+             (insert-file-contents \".git/rebase-apply/msg\"))\n             ((file-readable-p \".git/MERGE_MSG\")\n              (insert-file-contents \".git/MERGE_MSG\")))\n       ; delete empty lines at end\n@@ -1272,9 +1272,9 @@ Return the list of files that haven't been handled.\"\n           (coding-system (git-get-commits-coding-system))\n           author-name author-email subject date)\n       (when (eq 0 (buffer-size buffer))\n-        (when (file-readable-p \".git/rebase/info\")\n+        (when (file-readable-p \".git/rebase-apply/info\")\n           (with-temp-buffer\n-            (insert-file-contents \".git/rebase/info\")\n+            (insert-file-contents \".git/rebase-apply/info\")\n             (goto-char (point-min))\n             (when (re-search-forward \"^Author: \\\\(.*\\\\)\\nEmail: \\\\(.*\\\\)$\" nil t)\n               (setq author-name (match-string 1))\ndiff --git a/git-am.sh b/git-am.sh\nindex 60aaa4a..9bf12fe 100755\n--- a/git-am.sh\n+++ b/git-am.sh\n@@ -121,7 +121,7 @@ It does not apply to blobs recorded in its index.\"\n }\n \n prec=4\n-dotest=\"$GIT_DIR/rebase\"\n+dotest=\"$GIT_DIR/rebase-apply\"\n sign= utf8=t keep= skip= interactive= resolved= binary= rebasing= abort=\n resolvemsg= resume=\n git_apply_opt=\ndiff --git a/git-quiltimport.sh b/git-quiltimport.sh\nindex c9aecfd..cebaee1 100755\n--- a/git-quiltimport.sh\n+++ b/git-quiltimport.sh\n@@ -53,7 +53,7 @@ if ! [ -d \"$QUILT_PATCHES\" ] ; then\n fi\n \n # Temporary directories\n-tmp_dir=\"$GIT_DIR\"/rebase\n+tmp_dir=\"$GIT_DIR\"/rebase-apply\n tmp_msg=\"$tmp_dir/msg\"\n tmp_patch=\"$tmp_dir/patch\"\n tmp_info=\"$tmp_dir/info\"\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 6ef5754..412e135 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -14,8 +14,8 @@ It is possible that a merge failure will prevent this process from being\n completely automatic.  You will have to resolve any such merge failure\n and run git rebase --continue.  Another option is to bypass the commit\n that caused the merge failure with git rebase --skip.  To restore the\n-original <branch> and remove the .git/rebase working files, use the command\n-git rebase --abort instead.\n+original <branch> and remove the .git/rebase-apply working files, use the\n+command git rebase --abort instead.\n \n Note that if <branch> is not specified on the command line, the\n currently checked out branch is used.\n@@ -150,7 +150,7 @@ while test $# != 0\n do\n \tcase \"$1\" in\n \t--continue)\n-\t\ttest -d \"$dotest\" -o -d \"$GIT_DIR\"/rebase ||\n+\t\ttest -d \"$dotest\" -o -d \"$GIT_DIR\"/rebase-apply ||\n \t\t\tdie \"No rebase in progress?\"\n \n \t\tgit diff-files --quiet --ignore-submodules || {\n@@ -173,15 +173,15 @@ do\n \t\t\tfinish_rb_merge\n \t\t\texit\n \t\tfi\n-\t\thead_name=$(cat \"$GIT_DIR\"/rebase/head-name) &&\n-\t\tonto=$(cat \"$GIT_DIR\"/rebase/onto) &&\n-\t\torig_head=$(cat \"$GIT_DIR\"/rebase/orig-head) &&\n+\t\thead_name=$(cat \"$GIT_DIR\"/rebase-apply/head-name) &&\n+\t\tonto=$(cat \"$GIT_DIR\"/rebase-apply/onto) &&\n+\t\torig_head=$(cat \"$GIT_DIR\"/rebase-apply/orig-head) &&\n \t\tgit am --resolved --3way --resolvemsg=\"$RESOLVEMSG\" &&\n \t\tmove_to_original_branch\n \t\texit\n \t\t;;\n \t--skip)\n-\t\ttest -d \"$dotest\" -o -d \"$GIT_DIR\"/rebase ||\n+\t\ttest -d \"$dotest\" -o -d \"$GIT_DIR\"/rebase-apply ||\n \t\t\tdie \"No rebase in progress?\"\n \n \t\tgit reset --hard HEAD || exit $?\n@@ -201,15 +201,15 @@ do\n \t\t\tfinish_rb_merge\n \t\t\texit\n \t\tfi\n-\t\thead_name=$(cat \"$GIT_DIR\"/rebase/head-name) &&\n-\t\tonto=$(cat \"$GIT_DIR\"/rebase/onto) &&\n-\t\torig_head=$(cat \"$GIT_DIR\"/rebase/orig-head) &&\n+\t\thead_name=$(cat \"$GIT_DIR\"/rebase-apply/head-name) &&\n+\t\tonto=$(cat \"$GIT_DIR\"/rebase-apply/onto) &&\n+\t\torig_head=$(cat \"$GIT_DIR\"/rebase-apply/orig-head) &&\n \t\tgit am -3 --skip --resolvemsg=\"$RESOLVEMSG\" &&\n \t\tmove_to_original_branch\n \t\texit\n \t\t;;\n \t--abort)\n-\t\ttest -d \"$dotest\" -o -d \"$GIT_DIR\"/rebase ||\n+\t\ttest -d \"$dotest\" -o -d \"$GIT_DIR\"/rebase-apply ||\n \t\t\tdie \"No rebase in progress?\"\n \n \t\tgit rerere clear\n@@ -217,7 +217,7 @@ do\n \t\tthen\n \t\t\tmove_to_original_branch\n \t\telse\n-\t\t\tdotest=\"$GIT_DIR\"/rebase\n+\t\t\tdotest=\"$GIT_DIR\"/rebase-apply\n \t\t\tmove_to_original_branch\n \t\tfi\n \t\tgit reset --hard $(cat \"$dotest/orig-head\")\n@@ -265,18 +265,20 @@ do\n \tshift\n done\n \n-# Make sure we do not have $GIT_DIR/rebase\n+# Make sure we do not have $GIT_DIR/rebase-apply\n if test -z \"$do_merge\"\n then\n-\tif mkdir \"$GIT_DIR\"/rebase\n+\tif mkdir \"$GIT_DIR\"/rebase-apply\n \tthen\n-\t\trmdir \"$GIT_DIR\"/rebase\n+\t\trmdir \"$GIT_DIR\"/rebase-apply\n \telse\n \t\techo >&2 '\n-It seems that I cannot create a '\"$GIT_DIR\"'/rebase directory, and I wonder if you\n-are in the middle of patch application or another rebase.  If that is not\n-the case, please rm -fr '\"$GIT_DIR\"'/rebase and run me again.  I am stopping in case\n-you still have something valuable there.'\n+It seems that I cannot create a '\"$GIT_DIR\"'/rebase-apply directory,\n+and I wonder if you are in the middle of patch application or another\n+rebase.  If that is not the case, please\n+\trm -fr '\"$GIT_DIR\"'/rebase-apply\n+ and run me again.  I am stopping in case you still have something\n+valuable there.'\n \t\texit 1\n \tfi\n else\n@@ -395,10 +397,10 @@ then\n \tgit am $git_am_opt --rebasing --resolvemsg=\"$RESOLVEMSG\" &&\n \tmove_to_original_branch\n \tret=$?\n-\ttest 0 != $ret -a -d \"$GIT_DIR\"/rebase &&\n-\t\techo $head_name > \"$GIT_DIR\"/rebase/head-name &&\n-\t\techo $onto > \"$GIT_DIR\"/rebase/onto &&\n-\t\techo $orig_head > \"$GIT_DIR\"/rebase/orig-head\n+\ttest 0 != $ret -a -d \"$GIT_DIR\"/rebase-apply &&\n+\t\techo $head_name > \"$GIT_DIR\"/rebase-apply/head-name &&\n+\t\techo $onto > \"$GIT_DIR\"/rebase-apply/onto &&\n+\t\techo $orig_head > \"$GIT_DIR\"/rebase-apply/orig-head\n \texit $ret\n fi\n \ndiff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh\nindex 36d9a2a..166ddb1 100755\n--- a/t/t3401-rebase-partial.sh\n+++ b/t/t3401-rebase-partial.sh\n@@ -50,7 +50,7 @@ test_debug \\\n \n test_expect_success \\\n     'rebase topic branch against new master and check git-am did not get halted' \\\n-    'git-rebase master && test ! -d .git/rebase'\n+    'git-rebase master && test ! -d .git/rebase-apply'\n \n test_expect_success \\\n \t'rebase --merge topic branch that was partially merged upstream' \\\ndiff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh\nindex 12c8804..4de550a 100755\n--- a/t/t3407-rebase-abort.sh\n+++ b/t/t3407-rebase-abort.sh\n@@ -74,7 +74,7 @@ testrebase() {\n \t'\n }\n \n-testrebase \"\" .git/rebase\n+testrebase \"\" .git/rebase-apply\n testrebase \" --merge\" .git/rebase-merge\n \n test_done\ndiff --git a/t/t4150-am.sh b/t/t4150-am.sh\nindex 98ba020..6e6aaf5 100755\n--- a/t/t4150-am.sh\n+++ b/t/t4150-am.sh\n@@ -102,7 +102,7 @@ test_expect_success 'am applies patch correctly' '\n \tgit checkout first &&\n \ttest_tick &&\n \tgit am <patch1 &&\n-\t! test -d .git/rebase &&\n+\t! test -d .git/rebase-apply &&\n \ttest -z \"$(git diff second)\" &&\n \ttest \"$(git rev-parse second)\" = \"$(git rev-parse HEAD)\" &&\n \ttest \"$(git rev-parse second^)\" = \"$(git rev-parse HEAD^)\"\n@@ -123,7 +123,7 @@ test_expect_success 'am changes committer and keeps author' '\n \ttest_tick &&\n \tgit checkout first &&\n \tgit am patch2 &&\n-\t! test -d .git/rebase &&\n+\t! test -d .git/rebase-apply &&\n \ttest \"$(git rev-parse master^^)\" = \"$(git rev-parse HEAD^^)\" &&\n \ttest -z \"$(git diff master..HEAD)\" &&\n \ttest -z \"$(git diff master^..HEAD^)\" &&\n@@ -163,7 +163,7 @@ test_expect_success 'am without --keep removes Re: and [PATCH] stuff' '\n test_expect_success 'am --keep really keeps the subject' '\n \tgit checkout HEAD^ &&\n \tgit am --keep patch4 &&\n-\t! test -d .git/rebase &&\n+\t! test -d .git/rebase-apply &&\n \tgit-cat-file commit HEAD |\n \t\tgrep -q -F \"Re: Re: Re: [PATCH 1/5 v2] third\"\n '\n@@ -176,19 +176,19 @@ test_expect_success 'am -3 falls back to 3-way merge' '\n \ttest_tick &&\n \tgit commit -m \"copied stuff\" &&\n \tgit am -3 lorem-move.patch &&\n-\t! test -d .git/rebase &&\n+\t! test -d .git/rebase-apply &&\n \ttest -z \"$(git diff lorem)\"\n '\n \n test_expect_success 'am pauses on conflict' '\n \tgit checkout lorem2^^ &&\n \ttest_must_fail git am lorem-move.patch &&\n-\ttest -d .git/rebase\n+\ttest -d .git/rebase-apply\n '\n \n test_expect_success 'am --skip works' '\n \tgit am --skip &&\n-\t! test -d .git/rebase &&\n+\t! test -d .git/rebase-apply &&\n \ttest -z \"$(git diff lorem2^^ -- file)\" &&\n \ttest goodbye = \"$(cat another)\"\n '\n@@ -196,31 +196,31 @@ test_expect_success 'am --skip works' '\n test_expect_success 'am --resolved works' '\n \tgit checkout lorem2^^ &&\n \ttest_must_fail git am lorem-move.patch &&\n-\ttest -d .git/rebase &&\n+\ttest -d .git/rebase-apply &&\n \techo resolved >>file &&\n \tgit add file &&\n \tgit am --resolved &&\n-\t! test -d .git/rebase &&\n+\t! test -d .git/rebase-apply &&\n \ttest goodbye = \"$(cat another)\"\n '\n \n test_expect_success 'am takes patches from a Pine mailbox' '\n \tgit checkout first &&\n \tcat pine patch1 | git am &&\n-\t! test -d .git/rebase &&\n+\t! test -d .git/rebase-apply &&\n \ttest -z \"$(git diff master^..HEAD)\"\n '\n \n test_expect_success 'am fails on mail without patch' '\n \ttest_must_fail git am <failmail &&\n-\trm -r .git/rebase/\n+\trm -r .git/rebase-apply/\n '\n \n test_expect_success 'am fails on empty patch' '\n \techo \"---\" >>failmail &&\n \ttest_must_fail git am <failmail &&\n \tgit am --skip &&\n-\t! test -d .git/rebase\n+\t! test -d .git/rebase-apply\n '\n \n test_expect_success 'am works from stdin in subdirectory' '\ndiff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh\nindex 08bf1f0..83896e9 100755\n--- a/t/t9106-git-svn-commit-diff-clobber.sh\n+++ b/t/t9106-git-svn-commit-diff-clobber.sh\n@@ -87,7 +87,9 @@ test_expect_success 'multiple dcommit from git-svn will not clobber svn' \"\n \t\"\n \n \n-test_expect_success 'check that rebase really failed' 'test -d .git/rebase'\n+test_expect_success 'check that rebase really failed' '\n+\ttest -d .git/rebase-apply\n+'\n \n test_expect_success 'resolve, continue the rebase and dcommit' \"\n \techo clobber and I really mean it > file &&\n-- \n1.5.6.2.516.g22071\n"}]}