rendered paste bodymshaver@Matt:~$ cd emc2-dev/
mshaver@Matt:~/emc2-dev$ git status
# On branch v2.5_branch
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: configs/smithy/1034gecko.ini
# modified: configs/smithy/1240.ini
# modified: configs/smithy/1240_4axis.ini
# modified: configs/smithy/1240combined.ini
# modified: configs/smithy/1240gecko.ini
# modified: configs/smithy/1240rutex.ini
# modified: configs/smithy/1240rutex_4axis.ini
# modified: configs/smithy/516gecko.ini
# modified: configs/smithy/6130.hal
# modified: configs/smithy/6130.ini
# modified: configs/smithy/622.ini
# modified: configs/smithy/622_4axis.ini
# modified: configs/smithy/622gecko.ini
# modified: configs/smithy/622keyence.ini
# modified: configs/smithy/622leadshine.ini
# modified: configs/smithy/622leadshine_4axis.ini
# modified: configs/smithy/924.ini
# modified: configs/smithy/README
# modified: configs/smithy/emc.var
#
no changes added to commit (use "git add" and/or "git commit -a")
mshaver@Matt:~/emc2-dev$ git commit -s -a -m"Fix paths and ngcgui entries in ini files"
[v2.5_branch 86e7611] Fix paths and ngcgui entries in ini files
19 files changed, 375 insertions(+), 472 deletions(-)
mshaver@Matt:~/emc2-dev$ git push
To ssh://mshaver@git.linuxcnc.org/git/emc2.git
! [rejected] master -> master (non-fast-forward)
! [rejected] v2.4_branch -> v2.4_branch (non-fast-forward)
! [rejected] v2.5_branch -> v2.5_branch (non-fast-forward)
error: failed to push some refs to 'ssh://mshaver@git.linuxcnc.org/git/emc2.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again. See the 'Note about
fast-forwards' section of 'git push --help' for details.
mshaver@Matt:~/emc2-dev$ git pull
remote: Counting objects: 39, done.
remote: Compressing objects: 100% (24/24), done.
remote: Total 24 (delta 21), reused 0 (delta 0)
Unpacking objects: 100% (24/24), done.
From ssh://git.linuxcnc.org/git/emc2
0df95b8..449f932 v2.5_branch -> origin/v2.5_branch
Removing docs/src/gui/images/lathe-tool_fr.png
Removing docs/src/gui/images/lathe-tool_fr.svg
Merge made by recursive.
docs/src/common/Getting_EMC_fr.txt | 47 +--
docs/src/common/System_Requirements_fr.txt | 7 +-
docs/src/gui/axis_fr.txt | 235 ++++++------
docs/src/gui/images/lathe-tool_fr.png | Bin 51476 -> 0 bytes
docs/src/gui/images/lathe-tool_fr.svg | 528 -------------------------
docs/src/index_fr.tmpl | 2 +-
docs/src/quickstart/stepper_quickstart_fr.txt | 28 +-
src/po/fr.po | 6 +-
8 files changed, 163 insertions(+), 690 deletions(-)
delete mode 100644 docs/src/gui/images/lathe-tool_fr.png
delete mode 100644 docs/src/gui/images/lathe-tool_fr.svg
mshaver@Matt:~/emc2-dev$ git push
Counting objects: 48, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (25/25), done.
Writing objects: 100% (25/25), 4.81 KiB, done.
Total 25 (delta 23), reused 0 (delta 0)
To ssh://mshaver@git.linuxcnc.org/git/emc2.git
449f932..4d73846 v2.5_branch -> v2.5_branch
! [rejected] master -> master (non-fast-forward)
! [rejected] v2.4_branch -> v2.4_branch (non-fast-forward)
error: failed to push some refs to 'ssh://mshaver@git.linuxcnc.org/git/emc2.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again. See the 'Note about
fast-forwards' section of 'git push --help' for details.