Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: lukasoppermann/html5sortable
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.2.4
Choose a base ref
...
head repository: lukasoppermann/html5sortable
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Mar 13, 2015

  1. * Added in a hover state if mouse is over element. Using :hover cause…

    …s issues if dragged element is over the next element. Using js to apply or remove a hover class solves this issue
    Brandon Ferens committed Mar 13, 2015
    Copy the full SHA
    350acf3 View commit details

Commits on Apr 30, 2015

  1. update for test coverage

    Lukas Oppermann committed Apr 30, 2015
    Copy the full SHA
    e48bb1f View commit details
  2. Merge pull request #110 from lukasoppermann/mocha

    update for test coverage
    Lukas Oppermann committed Apr 30, 2015
    Copy the full SHA
    15654bc View commit details
  3. update travis build job

    Lukas Oppermann committed Apr 30, 2015
    Copy the full SHA
    7758973 View commit details
  4. update readme coverage

    Lukas Oppermann committed Apr 30, 2015
    Copy the full SHA
    b676f55 View commit details
  5. adding test for globally defined sortable

    Lukas Oppermann committed Apr 30, 2015
    Copy the full SHA
    08a9518 View commit details
  6. Merge pull request #111 from lukasoppermann/test-global

    adding test for globally defined sortable
    Lukas Oppermann committed Apr 30, 2015
    Copy the full SHA
    b69da0b View commit details
  7. update readme

    Lukas Oppermann committed Apr 30, 2015
    Copy the full SHA
    15f303a View commit details

Commits on May 1, 2015

  1. adding more testsst

    Lukas Oppermann committed May 1, 2015
    Copy the full SHA
    72bddf1 View commit details

Commits on May 2, 2015

  1. Merge pull request #112 from lukasoppermann/mocha

    adding more tests & making code more testable. Coverage is wrong.
    Lukas Oppermann committed May 2, 2015
    Copy the full SHA
    3f82b3c View commit details
  2. refactor & adding more tests

    Lukas Oppermann committed May 2, 2015
    Copy the full SHA
    779525f View commit details

Commits on May 3, 2015

  1. Merge pull request #113 from lukasoppermann/mocha

    refactor & adding more tests
    Lukas Oppermann committed May 3, 2015
    Copy the full SHA
    69ad71b View commit details
  2. remove old js from example

    Lukas Oppermann committed May 3, 2015
    Copy the full SHA
    2ff4716 View commit details
  3. Merge pull request #114 from lukasoppermann/mocha

    remove old js from example
    Lukas Oppermann committed May 3, 2015
    Copy the full SHA
    810d5b1 View commit details
  4. add tests for events

    Lukas Oppermann committed May 3, 2015
    Copy the full SHA
    e88b9ba View commit details
  5. Merge pull request #115 from lukasoppermann/mocha

    add tests for events
    Lukas Oppermann committed May 3, 2015
    Copy the full SHA
    dcefab9 View commit details

Commits on May 5, 2015

  1. working on extraction options & adding test

    Lukas Oppermann committed May 5, 2015
    Copy the full SHA
    3670dfc View commit details

Commits on May 6, 2015

  1. Copy the full SHA
    461518e View commit details
  2. Merge pull request #117 from lukasoppermann/publish-task

    add task for publishing new versions (user with commit access only)
    Lukas Oppermann committed May 6, 2015
    Copy the full SHA
    3e7df5d View commit details
  3. Merge pull request #116 from lukasoppermann/mocha

    extracting options & adding test
    Lukas Oppermann committed May 6, 2015
    Copy the full SHA
    e484aa5 View commit details

Commits on May 8, 2015

  1. move all tests to mocha + jsdom

    Lukas Oppermann committed May 8, 2015
    Copy the full SHA
    4a8a60e View commit details

Commits on May 9, 2015

  1. Merge pull request #118 from lukasoppermann/test-env

    move all tests to mocha + jsdom
    Lukas Oppermann committed May 9, 2015
    Copy the full SHA
    340597d View commit details
  2. update badges

    Lukas Oppermann committed May 9, 2015
    Copy the full SHA
    f264c8f View commit details
  3. small fix

    Lukas Oppermann committed May 9, 2015
    Copy the full SHA
    aa8aa6b View commit details

Commits on May 10, 2015

  1. add test section to readme

    Lukas Oppermann committed May 10, 2015
    Copy the full SHA
    873c8b9 View commit details
  2. update roadmap

    Lukas Oppermann committed May 10, 2015
    Copy the full SHA
    dd03069 View commit details

Commits on May 12, 2015

  1. fixes #75 ghost

    Lukas Oppermann committed May 12, 2015
    Copy the full SHA
    514b764 View commit details
  2. Merge pull request #77 from lukasoppermann/fix-ghost

    fix ghost for handles & adding advanced functionality
    Lukas Oppermann committed May 12, 2015
    Copy the full SHA
    498367c View commit details
  3. fix reload options bug

    Lukas Oppermann committed May 12, 2015
    Copy the full SHA
    acc2e25 View commit details
  4. Merge pull request #120 from lukasoppermann/fix-reload

    fix reload options bug
    Lukas Oppermann committed May 12, 2015
    Copy the full SHA
    3986963 View commit details
  5. update to include ghost fix & reload options fix

    Lukas Oppermann committed May 12, 2015
    Copy the full SHA
    3c23d8d View commit details
  6. fix cache issue for gulpfile

    Lukas Oppermann committed May 12, 2015
    Copy the full SHA
    040f047 View commit details
  7. bump to version v0.2.5

    Lukas Oppermann committed May 12, 2015
    Copy the full SHA
    56b9ddd View commit details
  8. bump to version v0.2.5

    Lukas Oppermann committed May 12, 2015
    Copy the full SHA
    50ef7a6 View commit details
  9. update

    Lukas Oppermann committed May 12, 2015
    Copy the full SHA
    d85df4e View commit details
  10. update

    Lukas Oppermann committed May 12, 2015
    Copy the full SHA
    76289c8 View commit details

Commits on May 14, 2015

  1. refactoring destroy into individual options

    Lukas Oppermann committed May 14, 2015
    Copy the full SHA
    908bc3f View commit details
  2. Merge pull request #122 from lukasoppermann/destroy-fn

    refactoring destroy into individual options
    Lukas Oppermann committed May 14, 2015
    Copy the full SHA
    d9a0d86 View commit details
  3. add enable method with tests

    Lukas Oppermann committed May 14, 2015
    Copy the full SHA
    aeb9376 View commit details
  4. Merge pull request #123 from lukasoppermann/master

    add enable method
    Lukas Oppermann committed May 14, 2015
    Copy the full SHA
    55a9261 View commit details

Commits on May 15, 2015

  1. fix-handles

    Lukas Oppermann committed May 15, 2015
    Copy the full SHA
    cfa26d2 View commit details
  2. Merge pull request #125 from lukasoppermann/fix-handles

    fixing handles to work
    Lukas Oppermann committed May 15, 2015
    Copy the full SHA
    8d6aaab View commit details

Commits on May 19, 2015

  1. restructuring sortable src

    Lukas Oppermann committed May 19, 2015
    Copy the full SHA
    7f61815 View commit details
  2. Merge pull request #126 from lukasoppermann/serializing

    restructuring sortable: move methods to individual functions
    Lukas Oppermann committed May 19, 2015
    Copy the full SHA
    409e572 View commit details
  3. fix demo for bower install & add destroy and init buttons

    Lukas Oppermann committed May 19, 2015
    Copy the full SHA
    cc141dc View commit details
  4. Merge pull request #127 from lukasoppermann/fix-demo

    fix demo for bower install & add destroy and init buttons
    Lukas Oppermann committed May 19, 2015
    Copy the full SHA
    1c31250 View commit details
  5. Copy the full SHA
    7f57e89 View commit details
  6. Merge pull request #128 from lukasoppermann/serialize

    make sortable usable as an individual function & as a jquery plugin
    Lukas Oppermann committed May 19, 2015
    Copy the full SHA
    f687443 View commit details
  7. reordering & moving reload to its own function

    Lukas Oppermann committed May 19, 2015
    Copy the full SHA
    774bad7 View commit details
  8. Merge pull request #129 from lukasoppermann/master

    reordering & moving reload to its own function
    Lukas Oppermann committed May 19, 2015
    Copy the full SHA
    b034e4c View commit details
Showing with 25,168 additions and 2,139 deletions.
  1. +13 −0 .github/FUNDING.yml
  2. +32 −0 .github/ISSUE_TEMPLATE/bug_report.md
  3. +20 −0 .github/ISSUE_TEMPLATE/feature_request.md
  4. +61 −0 .github/dependabot.yml
  5. +34 −0 .github/workflows/html5sortable.yml
  6. +1 −1 .gitignore
  7. +0 −4 .jscsrc
  8. +0 −31 .jshintrc
  9. +0 −7 .travis.yml
  10. +0 −24 AUTHORS
  11. +46 −0 CODE_OF_CONDUCT.md
  12. +98 −0 CONTRIBUTING.md
  13. +25 −0 ISSUE_TEMPLATE.md
  14. +21 −0 LICENSE.md
  15. +309 −207 README.md
  16. +185 −0 __tests__/api.test.ts
  17. +34 −0 __tests__/debounce.test.ts
  18. +39 −0 __tests__/elementHeight.test.ts
  19. +29 −0 __tests__/elementWidth.test.ts
  20. +395 −0 __tests__/events/events.test.ts
  21. +116 −0 __tests__/events/hoverClass.test.ts
  22. +28 −0 __tests__/filter.test.ts
  23. +25 −0 __tests__/getHandles.test.ts
  24. +20 −0 __tests__/helpers.ts
  25. +59 −0 __tests__/index.test.ts
  26. +37 −0 __tests__/insertAfter.test.ts
  27. +36 −0 __tests__/insertBefore.test.ts
  28. +112 −0 __tests__/isConnected.test.ts
  29. +29 −0 __tests__/isInDom.test.ts
  30. +67 −0 __tests__/makePlaceholder.test.ts
  31. +35 −0 __tests__/offset.test.ts
  32. +60 −0 __tests__/options.test.ts
  33. +142 −0 __tests__/serialize.test.ts
  34. +138 −0 __tests__/setDragImage.test.ts
  35. +34 −0 __tests__/sortableMethodsTests/_removeItemData.test.ts
  36. +22 −0 __tests__/sortableMethodsTests/_removeItemEvents.test.ts
  37. +17 −0 __tests__/store/store.test.ts
  38. +61 −0 __tests__/store/storeConfig.test.ts
  39. +61 −0 __tests__/store/storeData.test.ts
  40. +32 −0 __tests__/store/storePlaceholder.test.ts
  41. +41 −0 __tests__/throttle.test.ts
  42. +0 −45 bower.json
  43. +0 −92 dist/html.sortable.angular.js
  44. +0 −2 dist/html.sortable.angular.min.js
  45. +0 −1 dist/html.sortable.angular.min.js.map
  46. +0 −207 dist/html.sortable.js
  47. +0 −2 dist/html.sortable.min.js
  48. +0 −1 dist/html.sortable.min.js.map
  49. +1,309 −0 dist/html5sortable.amd.js
  50. +1,307 −0 dist/html5sortable.cjs.js
  51. +1,305 −0 dist/html5sortable.es.js
  52. +1,310 −0 dist/html5sortable.js
  53. +2 −0 dist/html5sortable.min.js
  54. +1 −0 dist/html5sortable.min.js.map
  55. +1,107 −0 docs/basscss.css
  56. +1,310 −0 docs/html5sortable.js
  57. +542 −0 docs/index.html
  58. +0 −68 examples/angular-connected.html
  59. +0 −41 examples/angular-connected.js
  60. +0 −61 examples/angular-ngRepeat-connected.html
  61. +0 −30 examples/angular-ngRepeat-connected.js
  62. +0 −58 examples/angular-single.html
  63. +0 −20 examples/angular-single.js
  64. +0 −227 examples/commonjs.html
  65. +0 −280 examples/index.html
  66. +0 −233 examples/requirejs.html
  67. +0 −95 gulpfile.js
  68. +37 −0 make-release.sh
  69. +12,841 −0 package-lock.json
  70. +89 −43 package.json
  71. +52 −0 rollup.config.js
  72. +29 −0 src/attribute.ts
  73. +28 −0 src/data.ts
  74. +15 −0 src/debounce.ts
  75. +24 −0 src/defaultConfiguration.ts
  76. +23 −0 src/elementHeight.ts
  77. +19 −0 src/elementWidth.ts
  78. +32 −0 src/eventListener.ts
  79. +17 −0 src/filter.ts
  80. +7 −0 src/getEventTarget.ts
  81. +27 −0 src/getHandles.ts
  82. +13 −0 src/getIndex.ts
  83. +40 −0 src/hoverClass.ts
  84. +0 −92 src/html.sortable.angular.js
  85. +0 −195 src/html.sortable.src.js
  86. +696 −0 src/html5sortable.ts
  87. +30 −0 src/insertHtmlElements.ts
  88. +31 −0 src/isConnected.ts
  89. +13 −0 src/isInDom.ts
  90. +34 −0 src/makePlaceholder.ts
  91. +17 −0 src/offset.ts
  92. +45 −0 src/serialize.ts
  93. +67 −0 src/setDragImage.ts
  94. +149 −0 src/store.ts
  95. +26 −0 src/throttle.ts
  96. +20 −0 src/types/configuration.d.ts
  97. +9 −0 src/types/offset.d.ts
  98. +9 −0 src/types/serialized.d.ts
  99. +3 −0 src/types/sortable.d.ts
  100. +9 −0 src/types/store.d.ts
  101. +0 −26 test/amd.js
  102. +0 −1 test/angular.js
  103. +0 −16 test/api.js
  104. +0 −15 test/html/amd.html
  105. +0 −14 test/test_browserify.js
  106. +10 −0 tsconfig.json
13 changes: 13 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# These are supported funding model platforms

github: [lukasoppermann]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Test Case**
Please copy this [codepen](https://codepen.io/pen/?template=GRoQRxo) and create a working test case showing the experienced bug: https://codepen.io/pen/?template=GRoQRxo

**System (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
61 changes: 61 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
ignore:
- dependency-name: rollup
versions:
- 2.38.1
- 2.39.0
- 2.39.1
- 2.41.3
- 2.41.4
- 2.41.5
- 2.42.0
- 2.42.1
- 2.42.2
- 2.42.3
- 2.42.4
- 2.43.0
- 2.43.1
- 2.44.0
- 2.45.0
- 2.45.1
- dependency-name: eslint
versions:
- 7.20.0
- 7.22.0
- 7.23.0
- 7.24.0
- dependency-name: y18n
versions:
- 4.0.2
- dependency-name: "@typescript-eslint/eslint-plugin"
versions:
- 4.15.1
- 4.15.2
- 4.16.0
- 4.18.0
- 4.19.0
- 4.20.0
- 4.21.0
- dependency-name: "@typescript-eslint/parser"
versions:
- 4.15.1
- 4.15.2
- 4.16.0
- 4.18.0
- 4.19.0
- 4.20.0
- 4.21.0
- dependency-name: "@types/jest"
versions:
- 26.0.21
- 26.0.22
- dependency-name: typescript
versions:
- 4.1.4
34 changes: 34 additions & 0 deletions .github/workflows/html5sortable.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Build and test

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Cache node modules
uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Build and test
uses: actions/setup-node@v1
with:
node-version: '14.x'
- run: npm ci
- run: npm run github-build

- name: Coveralls
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
node_modules
bower_components/
coverage
4 changes: 0 additions & 4 deletions .jscsrc

This file was deleted.

31 changes: 0 additions & 31 deletions .jshintrc

This file was deleted.

7 changes: 0 additions & 7 deletions .travis.yml

This file was deleted.

24 changes: 0 additions & 24 deletions AUTHORS

This file was deleted.

46 changes: 46 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at lukas@vea.re. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
98 changes: 98 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
# Contributing

We ❤️ contributions, so if you find a bug or have a great idea for a feature create an [issue](https://github.com/lukasoppermann/html5sortable/issues) or even better, send a [pull request](https://github.com/lukasoppermann/html5sortable/pulls).

We are a beginners friendly project! This means, we are happy to help you with contributing to the project. If you are not sure how to make your PR fulfill all the points below, send a [WIP] (work in progress) PR. In the description you can mentioning the points you are still working on and what you need help with.

If you are just starting out with github, you are very welcome to submit small PRs. For example improvements to the readme or code cleanup PRs.


## Pull Requests

- We use [standardjs](https://standardjs.com/) to enforce common coding style, so please write your code according to it. (Run `npm test` to see where you need adjust your code.)

- **Add tests!** - To avoid bugs we keep the test coverage as high as possible. Please help by adding tests to your bugfixes & features.

- **Comment your code** - Your code should be as self-documenting and easy to read as possible, however please add comments whenever possible/sensible. People with all levels of skill and involvement in the project will work on the code.

- **Use Docblocks for functions** – Every function should have a [docblock](http://usejsdoc.org/about-getting-started.html) above stating what the function does and what parameters it is supposed to receive, return values, etc.

```javascript
/*
* remove event handlers from sortable
* @param: {Element} sortable
*/
```

- **Document any change in behavior** - Make sure the `README.md` and any other relevant documentation are kept up-to-date.

- **Do NOT commit the dist folder** – Please do not commit anything in the `dist` directory, those files will be updated once a release is created.

- **One pull request per feature** - We appreciate every improvement you have for the project. To make it easy and fast to merge your pull requests, only change one thing per PR. We rather have 10 small PRs than one giant one.

- **Rebase to master**
Please make sure to [`rebase` to `master`](#rebase-to-master) so that your pull request can be easily merged.

**Remember:** If you have trouble with any of the steps above, just ask for help.

## Running Tests

``` bash
$ npm test
```

## Rebase

If you are new to rebasing you might want to create a backup of your branch, in case something goes wrong 😉.

### Rebase to master

#### Track the upstream master
First you need to track the `upstream/master` (master of this repo) from your fork.

```bash
git remote add upstream git@github.com:lukasoppermann/html5sortable.git
```

#### Rebase to the upstream master
Before you send a PR, or whenever you need to get changes from the upstream master into your branch, you need to do the following:

```bash
# get the latest changes from upstream
git fetch upstream
# go to your branch if you are not already on it
git checkout your-branch
# move your changes ontop of the current upstream/master branch
git rebase upstream/master
```

If you are unlucky you might get a conflict. You will need to resolve it just like a merge conflict.

### Interactive rebase
It is nice to try to send only meaningful commits, as this makes it easier for us to understand what you where doing. However when working one often has commits like `fix` or `update`.

To remove those and create an easy to understand history you can use `git rebase -i` – an interactive `-i` rebase.

```bash
# to work on the last 3 commits
git rebase -i HEAD~3
# to work on all commits up to 34kl24314
git rebase -i 34kl24314
```

First you will get an overview of your commits:

```bash
pick ae23f76 update contribution
pick 41c2535 update contribute
```

You can `pick` (keep), `reword` (keep & edit message), `edit`, `squash` (meld into the previous (shown) commit), `fixup` (like squash but without commit message), `exec` or `drop` (remove commit). Those options are listen as comments below the commits in your overview screen. You can also reorder commit to change the order in which they are shown.

**Note:** This screen is read from bottom to top, so for e.g. `squash` will meld into the commit above.

Once you are happy with you changes, save and close the file to move on. Another file with all commit messages is shown. Remove the ones you don't want and save and close this file as well. Your rebase should continue and you should be down.

**Note:** As you rewrote history, you will now need to force-push if you changed commits that are already on a remote server.

**Happy coding!**
Loading