summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorPratik Karki <predatoramigo@gmail.com>2018-09-04 14:59:58 -0700
committerJunio C Hamano <gitster@pobox.com>2018-09-06 11:56:20 -0700
commit051910a956fd0040bd73f5242f95c4771c86357c (patch)
tree5c32443a2427d56bf014c4f38ff12a239644465c /builtin/diff.c
parent002ee2fe68258e5a4c6dfa93b1c46cf3318b5342 (diff)
builtin rebase: support `--autosquash`
This commit adds support for the `--autosquash` option which is used to automatically squash the commits marked as `squash` or `fixup` in their messages. This is converted following `git-legacy-rebase.sh` closely. This option can also be configured via the Git config setting rebase.autosquash. To support this, we also add a custom rebase_config() function in this commit that will be used instead (and falls back to) git_default_config(). Signed-off-by: Pratik Karki <predatoramigo@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions