git rebase --continue: how to suppress the "no changes" check

Question

Is there a way to configure `git` so that `git rebase --continue` skips the "no changes" test? I don't want `git rebase --continue` to ever fail because it detects no changes. It should automatically delete the commit when this happens. Why? I frequently run into the problem with git where I `git rebase --continue` fails because it sees no changes and requires me to say `git rebase --skip`. I understand why this happens, but it slows down my workflow and makes it more dangerous: if I'm doing a large rebase where the problem recurs multiple times, along with legitimate merge conflicts, I'm more likely to accidentally use a skip command from the history when I meant to reuse a continue command. Example Suppose I have the following history: ``` A -- B -- C -- D -- E -- F <-- topic \ H -- I <-- master ``` and I want to push commits B, C, E, and F to the master branch in `origin`. Suppose that when I cherry pick them, B works fine, C and F have some trivial merge conflict caused by commits…

Accepted Answer

Interesting question. Here Automatically skip empty commits when using git rebase user Olivier Refalo suggested using a function from G2, simplified git interface for newbies. Basically it boils down to checking whether contents of files in index is different from files the repository after doing `git add`. If it's different do `git rebase --continue`, if it's the same do `git rebase --skip`. You could create script that would do the following:

```
#!/bin/sh

if git diff-index --quiet HEAD --; then
    git rebase --skip
else
    git rebase --continue
fi
```

Alternatively you can add an alias to your .gitconfig:

```
[alias]
          reb = "!if git diff-index --quiet HEAD --; then git rebase --skip; else git rebase --continue; fi"
```

git rebase --continue: how to suppress the "no changes" check

Solution

Problem

Related problems