Re: git alias quoting help

2016-04-01 Thread shawn wilson
On Fri, Apr 1, 2016 at 7:05 AM, Christian Couder wrote: > On Wed, Mar 30, 2016 at 6:13 AM, shawn wilson wrote: >> I've also tried to make this a plain bash script (w/o the function or >> if statements and am failing at the same place). The issue

Re: git alias quoting help

2016-04-01 Thread Christian Couder
On Wed, Mar 30, 2016 at 6:13 AM, shawn wilson wrote: > I've also tried to make this a plain bash script (w/o the function or > if statements and am failing at the same place). The issue seems to be > with the quoting in the filter-branch | ls-files bit. Also, the end > goal

Re: git alias quoting help

2016-04-01 Thread shawn wilson
I think I finally figured out how I want to do this: git remote add temp ..// git fetch temp git merge -s ours --no-commit temp/master git read-tree --prefix= -u temp/master: git commit -m "foo" However, when I do this, I've got all of the commits from the original (temp) repo. How do I prune

Re: git alias quoting help

2016-04-01 Thread shawn wilson
FWIW, I (finally) found two projects that like they'll do what I want: git-splits and git_filter The later was lacking in documentation and after the build I couldn't figure it out at a glance and I think git-splits will DWIW. On Thu, Mar 31, 2016 at 10:27 AM, shawn wilson

Re: git alias quoting help

2016-03-31 Thread shawn wilson
BTW, just trying to get filter-branch to interpret the bash script string correctly now and it still isn't working: git filter-branch -f --prune-empty --index-filter "\ git ls-files -s | \ sed \"s-\\t\\\"*-&${1}-\" | \ GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \ git update-index --index-info &&

git alias quoting help

2016-03-29 Thread shawn wilson
I've also tried to make this a plain bash script (w/o the function or if statements and am failing at the same place). The issue seems to be with the quoting in the filter-branch | ls-files bit. Also, the end goal here is to be able to move a directory from one repo and keep the history. While