From 29238a4ef6622e3c5fd8dbb8cd0d43325b6effa9 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sun, 15 May 2011 12:01:12 -0400 Subject: [PATCH] Update to modern Git syntax 'git-*' -> git *'. --- posts/Git/notes.org | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/posts/Git/notes.org b/posts/Git/notes.org index d66f172..282a9d1 100644 --- a/posts/Git/notes.org +++ b/posts/Git/notes.org @@ -313,14 +313,14 @@ Following [[http://github.com/maddox][Jon Maddox]] at the [[http://www.simplisti **** Create the decoy directory -=git-svn= keeps some info about the svn repository, to make it easier +=git svn= keeps some info about the svn repository, to make it easier to keep the two in sync. However we are not interested in staying in sync, we just want to move to Git. Create a decoy Git version of the repo with : $ mkdir sawsim.svn : $ cd sawsim.svn - : $ git-svn init svn://abax.physics.drexel.edu/sawsim/trunk/ + : $ git svn init svn://abax.physics.drexel.edu/sawsim/trunk/ : $ cat >> .git/config < users.txt < : EOF - : $ git-svn fetch + : $ git svn fetch Jon Maddox suggests using : $ git config svn.authorsfile ~/Desktop/users.txt instead of my manual =.git/config= editing, but my stock Debian git -(1.4.4.4) doesn't seem to have =git-config=. No big deal. +(1.4.4.4) doesn't seem to have =git config=. No big deal. Check that this worked and translated your users correctly with @@ -429,10 +429,10 @@ This is quite similar to [[#svn-migration][svn migration]]. : $ mkdir comedi.cvs : $ cd comedi.cvs : $ #cvs -d :pserver:anonymous@cvs.comedi.org:/cvs/comedi login - : $ git-cvsimport -p x -v -d :pserver:anonymous@cvs.comedi.org:/cvs/comedi comedi + : $ git cvsimport -p x -v -d :pserver:anonymous@cvs.comedi.org:/cvs/comedi comedi The login line may not be necessary for other CVS projects. -Arguments to git-cvsimport: +Arguments to =git cvsimport=: |----------+---------------------------------------------------------------------| | Option | Meaning | @@ -454,7 +454,7 @@ Arguments to git-cvsimport: *** Update with the latest cvs : $ cd comedi.cvs - : $ git-cvsimport -p x -v -d :pserver:anonymous@cvs.comedi.org:/cvs/comedi comedi + : $ git cvsimport -p x -v -d :pserver:anonymous@cvs.comedi.org:/cvs/comedi comedi : $ cd ../comedi : $ git pull @@ -462,7 +462,7 @@ You may have to deal with a [[#conflicting-merge][conflicting merge]]. *** Create a patch against the cvs source - : $ git-format-patch origin + : $ git format-patch origin * Other useful examples ** Purge all knowledge of a given file or subdir from history @@ -710,7 +710,7 @@ Maintain the result with subsequent pulls/merges using "subtree" From [[http://github.com/apenwarr/git-subtree/tree/master][git-subtree]] The super-project makes some local alterations. Pull/merge them -with =git-subtree=. +with =git subtree=. ** Backdating Git tags -- 2.26.2