Changes between Version 45 and Version 46 of TipAndDoc/scm/git

Timestamp:

Jan 20, 2014 3:08:01 PM (11 years ago)

Author:

mitty

Comment:

--

TipAndDoc/scm/git

@@ -70 +70 @@
   * [http://homepage3.nifty.com/iranoan/essay/pc/200809210.htm Google デスクトップで検索できない<-コンピュータ<-徒然なるままに<-Iranoan] に従って、適当な場所にpdftotextをインストール
   * {{{C:\Program Files (x86)\Git\bin\pdftotext.exe}}}を削除orリネーム
+
+ * [http://stackoverflow.com/questions/13500294/merge-a-branch-into-a-new-sub-directory-on-the-master git - merge a branch into a new sub directory on the master - Stack Overflow]
+  * ex) {{{git am -p2 --directory=production/ test/*.patch}}}
+  * {{{-p<n>}}}、{{{--directory=<dir>}}}はいずれもgit applyのオプション
+  * -pのデフォルトは-p1
 
  = git via https =