git rebase - Rename directory throughout Git commit history -


i'm trying rename directory introduced 6 commits ago , in subsequent commits. these commits have not been pushed.

what have tried?

  • i've tried using git filter-branch mv old new command, fails on commits before head~6 because directory doesn't exist.
  • i've tried git rebase -i head~6, editing each commit, can't use mv old new because git's locking file, nor can rename in windows explorer.
  • i've tried same rebase cp -r old new; rm -rf old; git add new creates merge conflicts on head~4 , above.

it may worth noting commit on directory introduced first commit in branch (the branch 6 commits ahead of master) , haven't touched master since branched out.

i've read this question.

what's best way this?

git filter-branch should work fine; make mv command fail gracefully appending || true. example, rename baz/ foo/bar/baz/:

git filter-branch --force --tree-filter \     'mkdir -p foo/bar; mv baz foo/bar/ || true' \     --tag-name-filter cat -- --all

Comments

Post a Comment

Popular posts from this blog

php - Add the correct number of days for each month -

using following function can display years , months between 2 dates, how can add correct days each month array within each month? can't add days manually need account leap years etc. function yearmonth($start_date, $end_date) { $begin = new datetime( $start_date ); $end = new datetime( $end_date); $interval = new dateinterval('p1m'); // 1 month interval $period = new dateperiod($begin, $interval, $end); foreach ( $period $dt ) $years[$dt->format( "y" )][] = $dt->format( "f" ); return $years; } $list = yearmonth("2007-03-24", "2009-06-26"); var_dump($list); since nobody else answered: function yearmonth($start_date, $end_date) { $begin = new datetime( $start_date ); $end = new datetime( $end_date); $interval = new dateinterval('p1d'); // 1 month interval $period = new dateperiod($begin, $interval, $end); $lastmonth = null; $lastyear = null; $aresult = array(); forea...
Read more

java.util.scanner - How to read and add only numbers to array from a text file -

i'm learning java , have question regarding reading file want read numbers file contains strings well. here example of file: 66.56 "3 java 3-43 5-42 2.1 1 and here coding: public class test { public static void main (string [] args){ if (0 < args.length) { file x = new file(args[0]); try{ scanner in = new scanner( new fileinputstream(x)); arraylist<double> test = new arraylist<>(); while(in.hasnext()){ if(in.hasnextdouble()){ double f=in.nextdouble(); test.add(f);} else {in.next();} } catch(ioexception e) { system.err.println("exception during reading: " + e); } } my problem add 66.56,2.1 , 1 doesn't add 3 after "3 or ignores 3-43 , 5-42 can tell me how skip strings , add doubles here? thanks all said 3 ie; "3, 3-43 , 4-42 strings either u read string , split , check number @ " , - or put in space between characters , integers. jvm after compilation tre...
Read more