Skip to content

Enable#7

Closed
Wackerbarth wants to merge 0 commit intothinkyhead:override_options_externfrom
Wackerbarth:ENABLE
Closed

Enable#7
Wackerbarth wants to merge 0 commit intothinkyhead:override_options_externfrom
Wackerbarth:ENABLE

Conversation

@Wackerbarth
Copy link

Scott -- This is a "drop in replacement" for your "override_options_extern" branch properly rebased for use in PR#2462

@thinkyhead thinkyhead force-pushed the override_options_extern branch from 2829dbd to 5034251 Compare July 19, 2015 22:35
@thinkyhead
Copy link
Owner

I just did a git rebase Development followed by git push -f and the result looks pretty clean: MarlinFirmware#2462

@Wackerbarth
Copy link
Author

Although your rebase is an improvement, it still has a couple of commits at the front which don't belong (Russian translation)

@thinkyhead thinkyhead force-pushed the override_options_extern branch 3 times, most recently from a9b75be to 21ebb76 Compare July 23, 2015 01:44
@thinkyhead
Copy link
Owner

commits at the front

Yeah, I was wondering where those were coming from. Ah well, re-rolling in small pieces now….

@Wackerbarth Wackerbarth deleted the ENABLE branch July 30, 2015 14:14
thinkyhead pushed a commit that referenced this pull request Aug 9, 2015
Provide both long and short version strings
thinkyhead pushed a commit that referenced this pull request Oct 9, 2016
thinkyhead pushed a commit that referenced this pull request Dec 3, 2016
thinkyhead pushed a commit that referenced this pull request Aug 24, 2019
# This is the 1st commit message:

Add Support for ADIMLab Granty

# The commit message #2 will be skipped:

# Update Configuration.h

# The commit message #3 will be skipped:

# Add files via upload
#
# Add Support for ADIMLab Granty

# The commit message #4 will be skipped:

# Create Configuration.h

# The commit message #5 will be skipped:

# Delete Configuration.h

# The commit message #6 will be skipped:

# Create Test.h

# The commit message #7 will be skipped:

# Add files via upload

# The commit message #8 will be skipped:

# Delete Test.h

# The commit message #9 will be skipped:

# Delete Configuration.h

# The commit message #10 will be skipped:

# Delete Configuration_adv.h

# The commit message #11 will be skipped:

# Add files via upload
#
# Add ADIMLab Pins

# The commit message #12 will be skipped:

# Add files via upload
#
# Add Bootscreen

# The commit message #13 will be skipped:

# Update Configuration.h
#
# Add Bootscreen

# The commit message #14 will be skipped:

# Update pins.h
#
# Add ADIMLab Board

# The commit message #15 will be skipped:

# Update boards.h
#
# Add ADIMLab Granty

# The commit message #16 will be skipped:

# Update Makefile
#
# Add ADIMLab Granty

# The commit message #17 will be skipped:

# Update boards.h

# The commit message #18 will be skipped:

# Update Makefile
thinkyhead added a commit that referenced this pull request Aug 24, 2019
* # This is a combination of 18 commits.
# This is the 1st commit message:

Add Support for ADIMLab Granty

# The commit message #2 will be skipped:

# Update Configuration.h

# The commit message #3 will be skipped:

# Add files via upload
#
# Add Support for ADIMLab Granty

# The commit message #4 will be skipped:

# Create Configuration.h

# The commit message #5 will be skipped:

# Delete Configuration.h

# The commit message #6 will be skipped:

# Create Test.h

# The commit message #7 will be skipped:

# Add files via upload

# The commit message #8 will be skipped:

# Delete Test.h

# The commit message #9 will be skipped:

# Delete Configuration.h

# The commit message #10 will be skipped:

# Delete Configuration_adv.h

# The commit message #11 will be skipped:

# Add files via upload
#
# Add ADIMLab Pins

# The commit message #12 will be skipped:

# Add files via upload
#
# Add Bootscreen

# The commit message #13 will be skipped:

# Update Configuration.h
#
# Add Bootscreen

# The commit message #14 will be skipped:

# Update pins.h
#
# Add ADIMLab Board

# The commit message #15 will be skipped:

# Update boards.h
#
# Add ADIMLab Granty

# The commit message #16 will be skipped:

# Update Makefile
#
# Add ADIMLab Granty

# The commit message #17 will be skipped:

# Update boards.h

# The commit message #18 will be skipped:

# Update Makefile

* Add Support for ADIMLab Granty

* Optimize bootscreen

* Update Makefile

Updated Description

* Update boards.h

Updated Description

* Update pins_HJC2560C_REV2.h

Updated Description

* Update Configuration.h

Added Author + Custom_Machine_Name

* Create _Bootscreen.h

Add Bootscreen

* Add files via upload

Add ADIMLab Granty v1

* Update boards.h

Add ADIMLab Granty v1

* Update Makefile

Add ADIMLab Granty v1

* Update pins_HJC2560C_REV2.h

* Consolidate Granty configs

* config updates
thinkyhead pushed a commit that referenced this pull request Jul 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants