Try #stash your changes $ git stash -u # pull a clean copy $ git pull
# if you want to reapply your patches $ git stash pop On Sat, Jun 6, 2020, 12:20 Akakima <[email protected]> wrote: > > Have you made any changes to your local copy? > > Yes. Some. > > To take in account the fact that i have a 32 bits OS with only 3 gig of > memory. > To allow J to compile under Cygwin. > May be 6 Files. > Plus i added some directories (but no conflicts with existing names). > > > > $ git status > On branch master > Your branch is up to date with 'origin/master'. > > Changes not staged for commit: > (use "git add/rm <file>..." to update what will be committed) > (use "git restore <file>..." to discard changes in working directory) > modified: jsrc/js.h > modified: jsrc/xf.c > modified: makemsvc/install.bat > modified: makemsvc/release.bat > deleted: test/g128x3.ijs > modified: test/g320ipt.ijs > modified: test/gdll.ijs > modified: test/gmbx.ijs > deleted: test/test.htm > > Untracked files: > (use "git add <file>..." to include in what will be committed) > jlibrary/addons/dev/ > jsrc/Trace.out > jsrc/a.out > jsrc/a.tds > jsrc/bcc32c.help > jsrc/jcon > jsrc/jconsole.cygwin.c > jsrc/jconsole.cygwin.c.orig > jsrc/jj.exe > jsrc/xf.cygwin.c > jsrc/xt.s > linux-mint-fail.txt > make.msvc/ > make2linux/ > makemsvc/jbld/ > makemsvc/jconsole/jconsole.res > makemsvc/jconsole/jconsole32.exe > makemsvc/jdll/j32.dll > makemsvc/jdll/j32.exp > makemsvc/jdll/j32.lib > makemsvc/jdll/jdll.res > makemsvc/run.bat > makemsvc/tsdll/tsdll32.dll > makemsvc/tsdll/tsdll32.exp > makemsvc/tsdll/tsdll32.lib > makemsvc2/ > test-20200512-13h09/ > test/crash/ > test/test.html > > no changes added to commit (use "git add" and/or "git commit -a") > > > On 2020-06-06 11:27, Michael Dykman wrote: > > Have you made any changes to your local copy? > > > > What does this give you? > > > > $ git status > > > ---------------------------------------------------------------------- > For information about J forums see http://www.jsoftware.com/forums.htm > ---------------------------------------------------------------------- For information about J forums see http://www.jsoftware.com/forums.htm
